diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-01-17 20:25:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-17 20:25:14 +0000 |
| commit | e6e0af03ee39b3e800c8f7e86eefffae432ee7c8 (patch) | |
| tree | e7cad3764c1cc90a92a3ea12cc59511ca9217750 /src/com/android | |
| parent | f8584042713aad82f9d057ecaace8a9ad1aad0bc (diff) | |
| parent | e029874bcfd6e55cb93fb6609f3342f180b5995c (diff) | |
| download | android_packages_apps_Trebuchet-e6e0af03ee39b3e800c8f7e86eefffae432ee7c8.tar.gz android_packages_apps_Trebuchet-e6e0af03ee39b3e800c8f7e86eefffae432ee7c8.tar.bz2 android_packages_apps_Trebuchet-e6e0af03ee39b3e800c8f7e86eefffae432ee7c8.zip | |
Merge "Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)" into jb-ub-now-kermit
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 61a594f21..9a16037ae 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; } |