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

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

Browse Source 
Change-Id: Id372fddbda0f2b2d8d34e40c72a4024da0c79686
This commit is contained in:
Robert Snoeberger
2020-05-10 05:31:27 +00:00
committed by Automerger Merge Worker
parent bd79ad8cb4 1be04e0cac
commit 9e37511910
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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