Merge "Revert "Don't show global actions if already handled"" into rvc-dev am: 0d85a392af am: 1be04e0cac am: 9e37511910 am: a80120520d

Change-Id: Ibfcfc222511eb5bc4876cedad24cbaa5fde4293b
This commit is contained in:
Robert Snoeberger
2020-05-10 06:05:05 +00:00
committed by Automerger Merge Worker

View File

@@ -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();
}
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: