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

Commit d3e084fa 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: 74b6caa2 

Change-Id: I335cc8a6bcaafc423e28bbb7e14bfb96ef911742
parents 0182e8a3 74b6caa2

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

+6 −4
Original line number Original line Diff line number Diff line
@@ -1222,10 +1222,12 @@ 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: