Merge "Don't show global actions if already handled" into rvc-dev am: 74b6caa2be am: 17fa86ca51

Change-Id: I39dfb5a9dbc7e7ccbac680447e799149d22e88aa
This commit is contained in:
Robert Snoeberger
2020-05-07 17:05:36 +00:00
committed by Automerger Merge Worker

View File

@@ -1222,10 +1222,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case LONG_PRESS_POWER_NOTHING:
break;
case LONG_PRESS_POWER_GLOBAL_ACTIONS:
mPowerKeyHandled = true;
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,
"Power - Long Press - Global Actions");
showGlobalActionsInternal();
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: