Merge "Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)" into jb-ub-now-kermit

This commit is contained in:
Adam Cohen authored and Android (Google) Code Review committed 2014-01-17 20:25:14 +00:00
commit e6e0af03ee
1 file changed
+10 -1
+10 -1
View File
@@ -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;
}