diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-12 00:05:02 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-14 14:38:19 +0200 |
commit | 336fd4f65b8fa0f5188060eba351fa70bb5bfde0 (patch) | |
tree | c5c5682ffe0bdb2ddef4a5042c15fc643d1061e2 /src/com/android/launcher3/Launcher.java | |
parent | 78cf9299b9273053aebba0fdc465d91753aae83f (diff) | |
download | android_packages_apps_Trebuchet-336fd4f65b8fa0f5188060eba351fa70bb5bfde0.tar.gz android_packages_apps_Trebuchet-336fd4f65b8fa0f5188060eba351fa70bb5bfde0.tar.bz2 android_packages_apps_Trebuchet-336fd4f65b8fa0f5188060eba351fa70bb5bfde0.zip |
Exit overview mode after setting wallpaper
Also, create method to exit overview mode without
an animation
Bug: 10332065
Change-Id: Iaade5ccb07aefa7d19be5f07db821a69762cb1bb
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 408f61a47..0a92f3563 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -660,9 +660,6 @@ public class Launcher extends Activity completeAddAppWidget(appWidgetId, args.container, args.screenId, null, null); result = true; break; - case REQUEST_PICK_WALLPAPER: - // We just wanted the activity result here so we can clear mWaitingForResult - break; } // Before adding this resetAddInfo(), after a shortcut was added to a workspace screen, // if you turned the screen off and then back while in All Apps, Launcher would not @@ -686,7 +683,13 @@ public class Launcher extends Activity addAppWidgetImpl(appWidgetId, mPendingAddInfo, null, mPendingAddWidgetInfo); } return; + } else if (requestCode == REQUEST_PICK_WALLPAPER) { + if (resultCode == RESULT_OK && mWorkspace.isInOverviewMode()) { + mWorkspace.exitOverviewMode(false); + } + return; } + boolean delayExitSpringLoadedMode = false; boolean isWidgetDrop = (requestCode == REQUEST_PICK_APPWIDGET || requestCode == REQUEST_CREATE_APPWIDGET); @@ -1631,7 +1634,7 @@ public class Launcher extends Activity // If we are already on home, then just animate back to the workspace, // otherwise, just wait until onResume to set the state back to Workspace if (alreadyOnHome) { - showWorkspace(); + showWorkspaceAndExitOverviewMode(); } else { mOnResumeState = State.WORKSPACE; } @@ -1665,10 +1668,10 @@ public class Launcher extends Activity } } - protected void showWorkspace() { + protected void showWorkspaceAndExitOverviewMode() { showWorkspace(true); if (mWorkspace.isInOverviewMode()) { - mWorkspace.exitOverviewMode(); + mWorkspace.exitOverviewMode(true); } } @@ -2128,7 +2131,7 @@ public class Launcher extends Activity if (isAllAppsVisible()) { showWorkspace(true); } else if (mWorkspace.isInOverviewMode()) { - mWorkspace.exitOverviewMode(); + mWorkspace.exitOverviewMode(true); } else if (mWorkspace.getOpenFolder() != null) { Folder openFolder = mWorkspace.getOpenFolder(); if (openFolder.isEditingName()) { @@ -2178,7 +2181,7 @@ public class Launcher extends Activity if (v instanceof CellLayout) { if (mWorkspace.isInOverviewMode()) { - mWorkspace.exitOverviewMode(mWorkspace.indexOfChild(v)); + mWorkspace.exitOverviewMode(mWorkspace.indexOfChild(v), true); } } |