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

Merge "Show global actions instead of assistant for LPP in setup wizard" into sc-dev

Browse Source
This commit is contained in:
Matt Casey
2021-06-14 02:33:30 +00:00
committed by Android (Google) Code Review
parent 2828678bd4 5d85ba60a6
commit 0b9d47ddbf
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -1181,6 +1181,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (FactoryTest.isLongPressOnPowerOffEnabled()) { if (FactoryTest.isLongPressOnPowerOffEnabled()) {
return LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM; return LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM;
} }
// If the config indicates the assistant behavior but the device isn't yet provisioned, show
// global actions instead.
if (mLongPressOnPowerBehavior == LONG_PRESS_POWER_ASSISTANT && !isDeviceProvisioned()) {
return LONG_PRESS_POWER_GLOBAL_ACTIONS;
}
return mLongPressOnPowerBehavior; return mLongPressOnPowerBehavior;
} }