summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-01-17 12:03:00 -0800
committerWinson Chung <winsonc@google.com>2014-01-17 12:03:00 -0800
commite029874bcfd6e55cb93fb6609f3342f180b5995c (patch)
tree80c27686bc20731d8ef9ca22503939b03f1df745 /src/com/android
parente1b0682af062bc85b7328f5c635a21d9ce420d8e (diff)
downloadandroid_packages_apps_Trebuchet-e029874bcfd6e55cb93fb6609f3342f180b5995c.tar.gz
android_packages_apps_Trebuchet-e029874bcfd6e55cb93fb6609f3342f180b5995c.tar.bz2
android_packages_apps_Trebuchet-e029874bcfd6e55cb93fb6609f3342f180b5995c.zip
Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher3/Launcher.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c119999e8..ce304ba28 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2053,7 +2053,16 @@ public class Launcher extends Activity
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
- showOverviewMode(true);
+ // Close any open folders
+ closeFolder();
+ // Stop resizing any widgets
+ mWorkspace.exitWidgetResizeMode();
+ if (!mWorkspace.isInOverviewMode()) {
+ // Show the overview mode
+ showOverviewMode(true);
+ } else {
+ showWorkspace(true);
+ }
return false;
}