commit 015bad07c6ec0c1230986a9ad8e866445a5a69b5
author Hyunyoung Song <hyunyoungs@google.com> Tue Jun 07 22:52:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 07 22:52:02 2016 +0000
tree 642b1c5c8a072a1f038935c26b447a9cfe67919b
parent b36a52eff88672d04e7fa5e516db1b6ac8136c69
parent 94c6b11bf68b2580e100e80cd0eb73bea6da4e52

Merge \"Fix NexusLauncher NPE\" into ub-launcher3-calgary
am: 94c6b11bf6

Change-Id: I1e2c363964dbf66cd27e2145f6e116755da42e4d

src/com/android/launcher3/LauncherStateTransitionAnimation.java

diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
index ca09f31..6cba2cb 100644
--- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java
+++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
@@ -677,7 +677,7 @@
                     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);