diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-09-16 17:09:33 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-09-16 17:11:20 -0700 |
| commit | 040a5d2f7a327bd777b5859edea32ed2f1d3593e (patch) | |
| tree | 9fea4da4e8be0f62ca4aa73af792a95599c1dc6d /src | |
| parent | f343499f9b2c01978027e810255274b714ac457d (diff) | |
| download | android_packages_apps_Trebuchet-040a5d2f7a327bd777b5859edea32ed2f1d3593e.tar.gz android_packages_apps_Trebuchet-040a5d2f7a327bd777b5859edea32ed2f1d3593e.tar.bz2 android_packages_apps_Trebuchet-040a5d2f7a327bd777b5859edea32ed2f1d3593e.zip | |
Ensure we exit overview mode when screen turns off (issue 10750327)
Change-Id: I2bd31bf549e2bd88a2fbc958b94e5e1107994162
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 98e9956d8..f8692c0ad 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1428,7 +1428,7 @@ public class Launcher extends Activity // processing a multi-step drop if (mAppsCustomizeTabHost != null && mPendingAddInfo.container == ItemInfo.NO_ID) { mAppsCustomizeTabHost.reset(); - showWorkspace(false); + showWorkspaceAndExitOverviewMode(false); } } else if (Intent.ACTION_USER_PRESENT.equals(action)) { mUserPresent = true; @@ -1634,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) { - showWorkspaceAndExitOverviewMode(); + showWorkspaceAndExitOverviewMode(true); } else { mOnResumeState = State.WORKSPACE; } @@ -1668,12 +1668,15 @@ public class Launcher extends Activity } } - protected void showWorkspaceAndExitOverviewMode() { - showWorkspace(true); + protected void showWorkspaceAndExitOverviewMode(boolean animate) { + showWorkspace(animate); if (mWorkspace.isInOverviewMode()) { - mWorkspace.exitOverviewMode(true); + mWorkspace.exitOverviewMode(animate); } } + protected void showWorkspaceAndExitOverviewMode() { + showWorkspaceAndExitOverviewMode(true); + } @Override public void onRestoreInstanceState(Bundle state) { |