summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-01-17 12:03:00 -0800
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:27 -0700
commit98623772f1573d53e3c5d2e88c9707a7247dac4a (patch)
tree5016563a8cff0e0adb4a705d2969ea5dbd82e562 /src/com/android
parent96985337f31b818aab7b0ec23a0751bc06c3f622 (diff)
downloadandroid_packages_apps_Trebuchet-98623772f1573d53e3c5d2e88c9707a7247dac4a.tar.gz
android_packages_apps_Trebuchet-98623772f1573d53e3c5d2e88c9707a7247dac4a.tar.bz2
android_packages_apps_Trebuchet-98623772f1573d53e3c5d2e88c9707a7247dac4a.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 319c45e23..e951f87ae 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2233,7 +2233,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;
}