Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c17b2352 authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14947557

Change-Id: I80ab56381f64f5a7be9844aa621e268b5273434b
parents d8eb483d 0b9d47dd

services/core/java/com/android/server/policy/PhoneWindowManager.java

+7 −0
Original line number Diff line number Diff line
@@ -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;

    }