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

Commit 17fa86ca 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: Ib508afad10b33f2dbed16a7b32260680cb78a02e
parents e931b251 74b6caa2

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: