diff options
| author | Winson Chung <winsonc@google.com> | 2012-03-27 16:30:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-27 16:30:49 -0700 |
| commit | 6a2a2899f79408f5123c860f2c6b06d150a10b0b (patch) | |
| tree | 1303707eae47042b32e77399bef1caec2fb17965 | |
| parent | 3549eb3bc6f7fae05684c3b16ed519a517449446 (diff) | |
| parent | 4884647ab22bd3a038d4904997bbb0ac03a09c1c (diff) | |
| download | android_packages_apps_Trebuchet-6a2a2899f79408f5123c860f2c6b06d150a10b0b.tar.gz android_packages_apps_Trebuchet-6a2a2899f79408f5123c860f2c6b06d150a10b0b.tar.bz2 android_packages_apps_Trebuchet-6a2a2899f79408f5123c860f2c6b06d150a10b0b.zip | |
Merge "Fixing issue where scrolling indicator was showing on the tablet. (Bug 6164741)"
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index d1a111ced..c64782c96 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -677,7 +677,7 @@ public class Workspace extends SmoothPagedView @Override protected boolean isScrollingIndicatorEnabled() { - return mState != State.SPRING_LOADED; + return super.isScrollingIndicatorEnabled() && (mState != State.SPRING_LOADED); } protected void onPageBeginMoving() { |