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

Commit e6e0af03 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Dismissing search and other overlays when the menu button is pressed.... 

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

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;

    }