commit 61edb5422b0803144533ef45f09b635b776d7b71
author Andrew Sapperstein <asapperstein@google.com> Mon Jun 20 19:38:54 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 20 19:38:54 2016 +0000
tree bf9bf89b4c11a911e6ff545ea17203ea2e0f3250
parent 97d89e924926cacad053e182def107e3eaa578dc
parent abef55a1c1f1fda4f42e4b4223534dd21f3dc19f

Merge "Update Launcher to use theme colors." into ub-launcher3-calgary

src/com/android/launcher3/WorkspaceStateTransitionAnimation.java

diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index d59058b..bd71808 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -164,7 +164,7 @@
         workspaceToAllApps = (oldStateIsNormal && stateIsNormalHidden);
         overviewToWorkspace = (oldStateIsOverview && stateIsNormal);
         overviewToAllApps = (oldStateIsOverview && stateIsOverviewHidden);
-        allAppsToWorkspace = (stateIsNormalHidden && stateIsNormal);
+        allAppsToWorkspace = (oldStateIsNormalHidden && stateIsNormal);
     }
 }