commit 6a2a2899f79408f5123c860f2c6b06d150a10b0b
author Winson Chung <winsonc@google.com> Tue Mar 27 16:30:49 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 16:30:49 2012 -0700
tree 1303707eae47042b32e77399bef1caec2fb17965
parent 3549eb3bc6f7fae05684c3b16ed519a517449446
parent 4884647ab22bd3a038d4904997bbb0ac03a09c1c

Merge "Fixing issue where scrolling indicator was showing on the tablet. (Bug 6164741)"

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index d1a111c..c64782c 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -677,7 +677,7 @@
 
     @Override
     protected boolean isScrollingIndicatorEnabled() {
-        return mState != State.SPRING_LOADED;
+        return super.isScrollingIndicatorEnabled() && (mState != State.SPRING_LOADED);
     }
 
     protected void onPageBeginMoving() {