From d2e4bae86311f339c11e054e3615628e9a655cb6 Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Sat, 11 Jul 2015 06:55:32 -0400 Subject: Launcher: Close OverviewMode when transitioning back to Workspace.State.NORMAL * OverviewMode can get in a weird funky state like folders did prior to I6e0b6f4d99bbb Change-Id: I4cd317216db8df7f49acc9d2e4d267f7dc395b8a Signed-off-by: Brandon McAnsh --- src/com/android/launcher3/Launcher.java | 5 +++++ 1 file changed, 5 insertions(+) (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 45f46742f..5331f04a4 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4315,9 +4315,14 @@ public class Launcher extends Activity void showWorkspace(boolean animated, Runnable onCompleteRunnable) { if (mState != State.WORKSPACE || mWorkspace.getState() != Workspace.State.NORMAL) { boolean wasInSpringLoadedMode = (mState != State.WORKSPACE); + // Close an open folder if one exists if (mWorkspace.getOpenFolder() != null) { closeFolder(false); } + // Close overview mode if open + if (mWorkspace.isInOverviewMode()) { + mWorkspace.exitOverviewMode(false); + } mWorkspace.setVisibility(View.VISIBLE); hideAppsCustomizeHelper(Workspace.State.NORMAL, animated, false, onCompleteRunnable); -- cgit v1.2.3