commit ff6a81508fb930fed6cc6fc426904a7093bf7172
author Tony Wickham <twickham@google.com> Wed Dec 02 23:18:22 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 02 23:18:22 2015 +0000
tree eb9d8fe5e0c557271decef50e5a49f5a182a5ad5
parent 4740e6ce15f55fa374d464be7c14981c9325a74c
parent ac929f4ad80fabeddfae51e30ec5d7ff434652c8

Merge "Disallow scrolling if workspace is in transition." into ub-launcher3-burnaby-polish
am: ac929f4ad8

* commit 'ac929f4ad80fabeddfae51e30ec5d7ff434652c8':
  Disallow scrolling if workspace is in transition.

src/com/android/launcher3/LauncherStateTransitionAnimation.java

diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
index 17dd6f3..668e021 100644
--- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java
+++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
@@ -723,11 +723,11 @@
                     }
                     animation.play(reveal);
                 }
-
-                dispatchOnLauncherTransitionPrepare(fromView, animated, true);
-                dispatchOnLauncherTransitionPrepare(toView, animated, true);
             }
 
+            dispatchOnLauncherTransitionPrepare(fromView, animated, true);
+            dispatchOnLauncherTransitionPrepare(toView, animated, true);
+
             animation.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index d01ee7a..af0e490 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1329,6 +1329,13 @@
     }
 
     @Override
+    protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
+        if (!isSwitchingState()) {
+            super.determineScrollingStart(ev, touchSlopScale);
+        }
+    }
+
+    @Override
     public void announceForAccessibility(CharSequence text) {
         // Don't announce if apps is on top of us.
         if (!mLauncher.isAppsViewVisible()) {