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

Commit 77cda822 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:... 

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

Change-Id: Ibfcfc222511eb5bc4876cedad24cbaa5fde4293b
parents 03566b67 a8012052

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

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