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

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

View File

@@ -1222,10 +1222,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case LONG_PRESS_POWER_NOTHING: case LONG_PRESS_POWER_NOTHING:
break; break;
case LONG_PRESS_POWER_GLOBAL_ACTIONS: case LONG_PRESS_POWER_GLOBAL_ACTIONS:
mPowerKeyHandled = true; if (!mPowerKeyHandled) {
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false, mPowerKeyHandled = true;
"Power - Long Press - Global Actions"); performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,
showGlobalActionsInternal(); "Power - Long Press - Global Actions");
showGlobalActionsInternal();
}
break; break;
case LONG_PRESS_POWER_SHUT_OFF: case LONG_PRESS_POWER_SHUT_OFF:
case LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM: case LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM: