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

Commit 1be04e0c authored by Robert Snoeberger's avatar Robert Snoeberger Committed by Automerger Merge Worker
Browse files

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

Change-Id: I0ed4c1fa0fa7fb6393e505de3e8e377493667bc7
parents 24f2f2e1 0d85a392

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

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

            case LONG_PRESS_POWER_NOTHING:

                break;

                break;

            case LONG_PRESS_POWER_GLOBAL_ACTIONS:

            case LONG_PRESS_POWER_GLOBAL_ACTIONS:

                if (!mPowerKeyHandled) {

                mPowerKeyHandled = true;

                mPowerKeyHandled = true;

                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,

                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,

                        "Power - Long Press - Global Actions");

                        "Power - Long Press - Global Actions");

                showGlobalActionsInternal();

                showGlobalActionsInternal();

                }

                break;

                break;

            case LONG_PRESS_POWER_SHUT_OFF:

            case LONG_PRESS_POWER_SHUT_OFF:

            case LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM:

            case LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM: