Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0734796 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am e6e0af03: Merge "Dismissing search and other overlays when the menu button... 

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

* commit 'e6e0af03':
  Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
parents f3a8e8c0 e6e0af03

src/com/android/launcher3/Launcher.java

+10 −1
Original line number Diff line number Diff line
@@ -2053,7 +2053,16 @@ public class Launcher extends Activity 
    @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);

        }

        return false;

    }