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

Commit 48c17072 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 am: 17fa86ca 

Change-Id: I67ee3a71b646bc0030caf92d724544d5db1d1fe4
parents f17d9d37 17fa86ca

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: