am 4f93ec63: Do not show overview when menu pressed on CustomContent screen.

* commit '4f93ec63b13f660fab63745d7127308954d5a6bd':
  Do not show overview when menu pressed on CustomContent screen.
This commit is contained in:
Yura authored and Android Git Automerger committed 2014-02-04 08:36:58 -08:00
commit f7bc687e6e
1 file changed
+15 -9
+15 -9
View File
@@ -2044,18 +2044,24 @@ public class Launcher extends Activity
}
}
public boolean isOnCustomContent() {
return mWorkspace.isOnOrMovingToCustomContent();
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
// Close any open folders
closeFolder();
// Stop resizing any widgets
mWorkspace.exitWidgetResizeMode();
if (!mWorkspace.isInOverviewMode()) {
// Show the overview mode
showOverviewMode(true);
} else {
showWorkspace(true);
if (!isOnCustomContent()) {
// 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;
}