diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-07 22:46:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-07 22:46:33 +0000 |
| commit | 94c6b11bf68b2580e100e80cd0eb73bea6da4e52 (patch) | |
| tree | 642b1c5c8a072a1f038935c26b447a9cfe67919b | |
| parent | f0c721b7c8dff319ed3e7f3c87cd98169b44e607 (diff) | |
| parent | 2e041a61afee3db678db73402cdcfdbb1c5e6640 (diff) | |
| download | android_packages_apps_Trebuchet-94c6b11bf68b2580e100e80cd0eb73bea6da4e52.tar.gz android_packages_apps_Trebuchet-94c6b11bf68b2580e100e80cd0eb73bea6da4e52.tar.bz2 android_packages_apps_Trebuchet-94c6b11bf68b2580e100e80cd0eb73bea6da4e52.zip | |
Merge "Fix NexusLauncher NPE" into ub-launcher3-calgary
| -rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index ca09f312f..6cba2cb13 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -677,7 +677,7 @@ public class LauncherStateTransitionAnimation { animated, initialized, animation, revealDuration, layerViews); } if (!animated || !initialized) { - if (!FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) { + if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) { mAllAppsController.finishPullDown(); } fromView.setVisibility(View.GONE); |