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

Commit 46102d09 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: I6f3db21d12c8b01fc2f116291c0688967a00ec74
parents 5b4f2947 0d85a392

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: