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

Commit 699f5d64 authored by Manu Cornet's avatar Manu Cornet Committed by Android (Google) Code Review
Browse files

Merge "Extract a protected method so that subclasses can share the logic"

parents 2ed6811f 24bf9974

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+6 −2
Original line number Diff line number Diff line
@@ -4041,9 +4041,13 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                && mStatusBarKeyguardViewManager.interceptMediaKey(event);

    }



    protected boolean shouldUnlockOnMenuPressed() {

        return mDeviceInteractive && mState != StatusBarState.SHADE

            && mStatusBarKeyguardViewManager.shouldDismissOnMenuPressed();

    }



    public boolean onMenuPressed() {

        if (mDeviceInteractive && mState != StatusBarState.SHADE

                && mStatusBarKeyguardViewManager.shouldDismissOnMenuPressed()) {

        if (shouldUnlockOnMenuPressed()) {

            animateCollapsePanels(

                    CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL /* flags */, true /* force */);

            return true;