Fixes a bug where the user ends in freescroll state even for regular workspace mode.
The bug happened while reordering pages in overview mode and clicking the back button.
The fix is to check the precodition in enableFreeScroll if we are in a valid state for enabling freescroll (currently only overview mode).
Bug: 33347786
Change-Id: Icc3005fd431569e2b9e3f52d2249de8ba8d13eab
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index ee7f9f8..3180f27 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1372,8 +1372,12 @@
dampedOverScroll(amount);
}
- public void enableFreeScroll() {
+ /**
+ * return true if freescroll has been enabled, false otherwise
+ */
+ public boolean enableFreeScroll() {
setEnableFreeScroll(true);
+ return true;
}
public void disableFreeScroll() {
@@ -2074,20 +2078,14 @@
if (!mReorderingStarted) return;
mReorderingStarted = false;
- // If we haven't flung-to-delete the current child, then we just animate the drag view
- // back into position
- final Runnable onCompleteRunnable = new Runnable() {
- @Override
- public void run() {
- onEndReordering();
- }
- };
-
mPostReorderingPreZoomInRunnable = new Runnable() {
public void run() {
- onCompleteRunnable.run();
+ // If we haven't flung-to-delete the current child,
+ // then we just animate the drag view back into position
+ onEndReordering();
+
enableFreeScroll();
- };
+ }
};
mPostReorderingPreZoomInRemainingAnimationCount =