From e25c5d1c94949044c4cd7416f60ea0dc12dadc8d Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 18 Jun 2014 10:34:58 -0700
Subject: Prevent discordant state between Workspace and Launcher (issue
 15409018)

Change-Id: I13bb3e51da18998a5dade49c50e5fbf2266022d3
---
 src/com/android/launcher3/Launcher.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/com/android/launcher3/Launcher.java')

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 60efcea6d..d76b2382e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3380,10 +3380,7 @@ public class Launcher extends Activity
     }
 
     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 @@ public class Launcher extends Activity
                 }
             }
         }, delay);
-
     }
 
     void exitSpringLoadedDragMode() {
-- 
cgit v1.2.3