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

am: ac929f4ad8

* commit 'ac929f4ad80fabeddfae51e30ec5d7ff434652c8':
  Disallow scrolling if workspace is in transition.
This commit is contained in:
Tony Wickham
2015-12-02 23:18:22 +00:00
committed by android-build-merger
2 changed files with 10 additions and 3 deletions

View File

@@ -723,11 +723,11 @@ public class LauncherStateTransitionAnimation {
}
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) {