commit e25c5d1c94949044c4cd7416f60ea0dc12dadc8d
author Adam Cohen <adamcohen@google.com> Wed Jun 18 10:34:58 2014 -0700
committer Adam Cohen <adamcohen@google.com> Wed Jun 18 10:38:31 2014 -0700
tree 61f255947289ae06ed215d071134e39b12b41429
parent 7fa0ae5056f753a26f267b633bbc160b2b86f725

Prevent discordant state between Workspace and Launcher (issue 15409018)

Change-Id: I13bb3e51da18998a5dade49c50e5fbf2266022d3

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 60efcea..d76b238 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3380,10 +3380,7 @@
     }
 
     void showWorkspace(boolean animated, Runnable onCompleteRunnable) {
-        if (mWorkspace.isInOverviewMode()) {
-            mWorkspace.exitOverviewMode(animated);
-        }
-        if (mState != State.WORKSPACE) {
+        if (mState != State.WORKSPACE || mWorkspace.getState() != Workspace.State.NORMAL) {
             boolean wasInSpringLoadedMode = (mState != State.WORKSPACE);
             mWorkspace.setVisibility(View.VISIBLE);
             hideAppsCustomizeHelper(Workspace.State.NORMAL, animated, false, onCompleteRunnable);
@@ -3472,7 +3469,6 @@
                 }
             }
         }, delay);
-
     }
 
     void exitSpringLoadedDragMode() {