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

Commit e368981d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Don't show global actions if already handled" into rvc-dev am:... 

Merge "Merge "Don't show global actions if already handled" into rvc-dev am: 74b6caa2 am: 17fa86ca" into rvc-d1-dev-plus-aosp
parents cb5e90c5 48c17072

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −4
Original line number Diff line number Diff line
@@ -1222,10 +1222,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            case LONG_PRESS_POWER_NOTHING:

                break;

            case LONG_PRESS_POWER_GLOBAL_ACTIONS:

                if (!mPowerKeyHandled) {

                    mPowerKeyHandled = true;

                    performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,

                            "Power - Long Press - Global Actions");

                    showGlobalActionsInternal();

                }

                break;

            case LONG_PRESS_POWER_SHUT_OFF:

            case LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM: