summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-07-09 17:34:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-09 17:34:53 -0700
commit8d4fa3935545b46d835dbcdc614ff5e353f30216 (patch)
treed81055d01e5f4eaf9418677f8d6396e8b84f9a7a /src
parentf74f02941820f14ba4c8baaeeb12b75ec552812e (diff)
parente52a750e4f63ca5fce642256844cc603d40e6f26 (diff)
downloadandroid_packages_apps_Trebuchet-8d4fa3935545b46d835dbcdc614ff5e353f30216.tar.gz
android_packages_apps_Trebuchet-8d4fa3935545b46d835dbcdc614ff5e353f30216.tar.bz2
android_packages_apps_Trebuchet-8d4fa3935545b46d835dbcdc614ff5e353f30216.zip
Merge "Fixing issue where the scrolling indicator was stuck while panning pages in spring loaded mode. (Bug 6603301)"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Workspace.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 21c78895b..610b9a2e0 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -710,11 +710,6 @@ public class Workspace extends SmoothPagedView
}
}
- @Override
- protected boolean isScrollingIndicatorEnabled() {
- return super.isScrollingIndicatorEnabled() && (mState != State.SPRING_LOADED);
- }
-
protected void onPageBeginMoving() {
super.onPageBeginMoving();