summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNebojsa Cvetkovic <nebkat@gmail.com>2013-11-26 13:27:30 +0000
committerDanesh M <daneshm90@gmail.com>2014-01-24 16:24:23 -0800
commitd14c5a17b22825ead2f56797efb5e52096375f9e (patch)
treef7fd73c2f4bc1184f4bce0f446fc02fa641b3561
parent91be1e92c88f406934eb4536bf7664a981cffbae (diff)
downloadandroid_packages_apps_Trebuchet-d14c5a17b22825ead2f56797efb5e52096375f9e.tar.gz
android_packages_apps_Trebuchet-d14c5a17b22825ead2f56797efb5e52096375f9e.tar.bz2
android_packages_apps_Trebuchet-d14c5a17b22825ead2f56797efb5e52096375f9e.zip
Launcher: Change menu button behavior
Until we implement custom menu button behavior, make the menu button toggle workspace overview state rather than just opening it. Also make sure overview mode isnt shown while we are in drawer. Change-Id: Ibebee653c92754833150c7ee60c301ac9a13d1da
-rw-r--r--src/com/android/launcher3/Launcher.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4ba11cd91..029e89b8b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1896,8 +1896,12 @@ public class Launcher extends Activity
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
- if (!mWorkspace.isInOverviewMode()) {
- mWorkspace.enterOverviewMode();
+ if (!isAllAppsVisible()) {
+ if (!mWorkspace.isInOverviewMode()) {
+ mWorkspace.enterOverviewMode();
+ } else {
+ mWorkspace.exitOverviewMode(true);
+ }
}
return false;
}