diff options
| author | Brandon McAnsh <brandon.mcansh@gmail.com> | 2015-07-11 06:55:32 -0400 |
|---|---|---|
| committer | Brandon McAnsh <brandon.mcansh@gmail.com> | 2015-07-14 10:56:35 -0700 |
| commit | d2e4bae86311f339c11e054e3615628e9a655cb6 (patch) | |
| tree | 324cc3339983be10780138f16beca5ccb5cf9854 | |
| parent | 5e950d26991f18b9844e2e9ab03ab6cb9767da1c (diff) | |
| download | android_packages_apps_Trebuchet-d2e4bae86311f339c11e054e3615628e9a655cb6.tar.gz android_packages_apps_Trebuchet-d2e4bae86311f339c11e054e3615628e9a655cb6.tar.bz2 android_packages_apps_Trebuchet-d2e4bae86311f339c11e054e3615628e9a655cb6.zip | |
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 <brandon.mcansh@gmail.com>
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 5 |
1 files changed, 5 insertions, 0 deletions
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); |