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

Commit 91ff485c 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:... 

Merge "Don't show global actions if already handled" into rvc-dev am: 74b6caa2 am: 17fa86ca am: 9cf09fc0

Change-Id: Id2421f1d01ed5ade51582d66a484f90ec2b03017
parents 2ccb9ab7 9cf09fc0

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: