diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-06 21:04:36 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-06 21:04:36 -0700 |
| commit | b11ae50fcb2bb07ee77645fdacdf90f67f58dae4 (patch) | |
| tree | 6c46b903501dde210b1d6f61f71602673f54fae2 /src/com/android/launcher3/LauncherStateTransitionAnimation.java | |
| parent | 645764e3e5fa34d9adcddfc722d726b76f048306 (diff) | |
| download | android_packages_apps_Trebuchet-b11ae50fcb2bb07ee77645fdacdf90f67f58dae4.tar.gz android_packages_apps_Trebuchet-b11ae50fcb2bb07ee77645fdacdf90f67f58dae4.tar.bz2 android_packages_apps_Trebuchet-b11ae50fcb2bb07ee77645fdacdf90f67f58dae4.zip | |
Guard all apps pull up work behind the flag
b/28917826
Change-Id: Ic001d820bad777d90c6bdcd1a17b6961e38769be
Diffstat (limited to 'src/com/android/launcher3/LauncherStateTransitionAnimation.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index 41e30b129..4563bf883 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -683,7 +683,9 @@ public class LauncherStateTransitionAnimation { animated, initialized, animation, revealDuration, layerViews); } if (!animated || !initialized) { - mAllAppsController.finishPullDown(); + if (!FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) { + mAllAppsController.finishPullDown(); + } fromView.setVisibility(View.GONE); dispatchOnLauncherTransitionPrepare(fromView, animated, multiplePagesVisible); dispatchOnLauncherTransitionStart(fromView, animated, true); |