Merge "Revert "Don't show global actions if already handled"" into rvc-dev

This commit is contained in:
Robert Snoeberger
2020-05-08 22:33:02 +00:00
committed by Android (Google) Code Review

View File

@@ -1222,12 +1222,10 @@ 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:
if (!mPowerKeyHandled) {
mPowerKeyHandled = true; mPowerKeyHandled = true;
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false, performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,
"Power - Long Press - Global Actions"); "Power - Long Press - Global Actions");
showGlobalActionsInternal(); 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: