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

Commit 8f182abb authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Merge "Shortened and adjustable screen timeouts" into qt-r1-dev am:... 

Merge "Merge "Shortened and adjustable screen timeouts" into qt-r1-dev am: 969c3d9b" into qt-r1-dev-plus-aosp
am: 70601671

Change-Id: Ie2f3a219e60d8b63d16360a3ae4bc5d109125b55
parents e6936e27 70601671

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 
    <!-- Whether or not we show the number in the bar. -->

    <bool name="config_statusBarShowNumber">false</bool>



    <!-- For how long the lock screen can be on before the display turns off. -->

    <integer name="config_lockScreenDisplayTimeout">10000</integer>



    <!-- Vibrator pattern for camera gesture launch. -->

    <integer-array translatable="false" name="config_cameraLaunchGestureVibePattern">

        <item>0</item>

packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java

+2 −2
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ public class DozeScreenState implements DozeMachine.Part { 
     * Delay entering low power mode when animating to make sure that we'll have

     * time to move all elements into their final positions while still at 60 fps.

     */

    private static final int ENTER_DOZE_DELAY = 6000;

    private static final int ENTER_DOZE_DELAY = 4000;

    /**

     * Hide wallpaper earlier when entering low power mode. The gap between

     * hiding the wallpaper and changing the display mode is necessary to hide

     * the black frame that's inherent to hardware specs.

     */

    public static final int ENTER_DOZE_HIDE_WALLPAPER_DELAY = 4500;

    public static final int ENTER_DOZE_HIDE_WALLPAPER_DELAY = 2500;



    private final DozeMachine.Service mDozeService;

    private final Handler mHandler;

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public class KeyguardViewMediator extends SystemUI { 
    /**

     * The default amount of time we stay awake (used for all key input)

     */

    public static final int AWAKE_INTERVAL_DEFAULT_MS = 10000;

    public static final int AWAKE_INTERVAL_BOUNCER_MS = 10000;



    /**

     * How long to wait after the screen turns off due to timeout before

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowController.java

+5 −1
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat 
    private final DozeParameters mDozeParameters;

    private final WindowManager.LayoutParams mLpChanged;

    private final boolean mKeyguardScreenRotation;

    private final long mLockScreenDisplayTimeout;

    private ViewGroup mStatusBarView;

    private WindowManager.LayoutParams mLp;

    private boolean mHasTopUi;
@@ -104,6 +105,8 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat 
        mDozeParameters = dozeParameters;

        mScreenBrightnessDoze = mDozeParameters.getScreenBrightnessDoze();

        mLpChanged = new WindowManager.LayoutParams();

        mLockScreenDisplayTimeout = context.getResources()

                .getInteger(R.integer.config_lockScreenDisplayTimeout);

        ((SysuiStatusBarStateController) Dependency.get(StatusBarStateController.class))

                .addCallback(mStateListener,

                        SysuiStatusBarStateController.RANK_STATUS_BAR_WINDOW_CONTROLLER);
@@ -280,7 +283,8 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat 
        if (state.isKeyguardShowingAndNotOccluded()

                && state.statusBarState == StatusBarState.KEYGUARD

                && !state.qsExpanded) {

            mLpChanged.userActivityTimeout = KeyguardViewMediator.AWAKE_INTERVAL_DEFAULT_MS;

            mLpChanged.userActivityTimeout = state.bouncerShowing

                    ? KeyguardViewMediator.AWAKE_INTERVAL_BOUNCER_MS : mLockScreenDisplayTimeout;

        } else {

            mLpChanged.userActivityTimeout = -1;

        }