diff options
| author | Tony Wickham <twickham@google.com> | 2015-12-02 23:18:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-02 23:18:22 +0000 |
| commit | ff6a81508fb930fed6cc6fc426904a7093bf7172 (patch) | |
| tree | eb9d8fe5e0c557271decef50e5a49f5a182a5ad5 /src/com/android/launcher3/LauncherStateTransitionAnimation.java | |
| parent | 4740e6ce15f55fa374d464be7c14981c9325a74c (diff) | |
| parent | ac929f4ad80fabeddfae51e30ec5d7ff434652c8 (diff) | |
| download | android_packages_apps_Trebuchet-ff6a81508fb930fed6cc6fc426904a7093bf7172.tar.gz android_packages_apps_Trebuchet-ff6a81508fb930fed6cc6fc426904a7093bf7172.tar.bz2 android_packages_apps_Trebuchet-ff6a81508fb930fed6cc6fc426904a7093bf7172.zip | |
Merge "Disallow scrolling if workspace is in transition." into ub-launcher3-burnaby-polish
am: ac929f4ad8
* commit 'ac929f4ad80fabeddfae51e30ec5d7ff434652c8':
Disallow scrolling if workspace is in transition.
Diffstat (limited to 'src/com/android/launcher3/LauncherStateTransitionAnimation.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index 17dd6f3e1..668e021c6 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -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) { |