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

This commit is contained in:
Matt Casey
2021-06-14 02:33:30 +00:00
committed by Android (Google) Code Review

View File

@@ -1181,6 +1181,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (FactoryTest.isLongPressOnPowerOffEnabled()) {
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;
}