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

Commit 97329ac7 authored by Robert Snoeberger's avatar Robert Snoeberger Committed by Automerger Merge Worker
Browse files

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

Merge "Don't show global actions if already handled" into rvc-dev am: 74b6caa2 am: 17fa86ca am: 9cf09fc0 am: 91ff485c

Change-Id: I0c352c7d2b4eb100be852433a4f4c94bc819f2e4
parents b72478f7 91ff485c

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: