Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-05-07 17:05:53 +00:00
committed by Android (Google) Code Review
parent cb5e90c579 48c1707224
commit e368981d8d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/policy/PhoneWindowManager.java
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:
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: