diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-06-07 04:18:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-07 04:18:24 +0000 |
| commit | 033f4ea716e295b34c58d4c59c891e45805c2f0d (patch) | |
| tree | feb25e1b520ef1b605cbb9f17b360c346f05a200 /src/com/android/launcher3/LauncherStateTransitionAnimation.java | |
| parent | e9c5f8925f79e559be64202117d7e89c29034304 (diff) | |
| parent | b11ae50fcb2bb07ee77645fdacdf90f67f58dae4 (diff) | |
| download | android_packages_apps_Trebuchet-033f4ea716e295b34c58d4c59c891e45805c2f0d.tar.gz android_packages_apps_Trebuchet-033f4ea716e295b34c58d4c59c891e45805c2f0d.tar.bz2 android_packages_apps_Trebuchet-033f4ea716e295b34c58d4c59c891e45805c2f0d.zip | |
Merge "Guard all apps pull up work behind the flag" into ub-launcher3-calgary
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); |