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

Commit 05ad234c authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Apply screen off brightness clamp when going to sleep. 

Previously this was only applied when the unlocked screen animation was playing, which ignores the case of timing out on the lock screen.

Fixes: 203181934
Test: atest SystemUITests
Change-Id: I93374f42cc6016f1c28678548c93cddd992415e6
parent 19f3902f

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

+9 −3
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.systemui.doze;



import static android.os.PowerManager.GO_TO_SLEEP_REASON_TIMEOUT;



import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -262,9 +266,11 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi 
     * animation.

     */

    private int clampToDimBrightnessForScreenOff(int brightness) {

        if (mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()

                && mWakefulnessLifecycle.getLastSleepReason()

                == PowerManager.GO_TO_SLEEP_REASON_TIMEOUT) {

        final boolean screenTurningOff =

                mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()

                        || mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_GOING_TO_SLEEP;

        if (screenTurningOff

                && mWakefulnessLifecycle.getLastSleepReason() == GO_TO_SLEEP_REASON_TIMEOUT) {

            return Math.max(

                    PowerManager.BRIGHTNESS_OFF,

                    // Use the lower of either the dim brightness, or the current brightness reduced

packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java

+33 −3
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
    }



    @Test

    public void transitionToDoze_duringScreenOff_afterTimeout_clampsToDim() {

    public void transitionToDoze_duringUnlockedScreenOff_afterTimeout_clampsToDim() {

        when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn(

                PowerManager.GO_TO_SLEEP_REASON_TIMEOUT);

        when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(true);
@@ -490,7 +490,7 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
    }



    @Test

    public void transitionToDoze_duringScreenOff_notAfterTimeout_doesNotClampToDim() {

    public void transitionToDoze_duringUnlockedScreenOff_notAfterTimeout_doesNotClampToDim() {

        when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn(

                PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON);

        when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(true);
@@ -505,7 +505,7 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
    }



    @Test

    public void transitionToDoze_duringScreenOff_afterTimeout_noScreenOff_doesNotClampToDim() {

    public void transitionToDoze_duringUnlockedScreenOff_afterTimeout_noScreenOff_doesNotClampToDim() {

        when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn(

                PowerManager.GO_TO_SLEEP_REASON_TIMEOUT);

        when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(false);
@@ -518,6 +518,36 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
        assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS);

    }



    @Test

    public void transitionToDoze_duringLockedScreenOff_afterTimeout_clampsToDim() {

        when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn(

                PowerManager.GO_TO_SLEEP_REASON_TIMEOUT);

        when(mWakefulnessLifecycle.getWakefulness()).thenReturn(

                WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP);

        when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(false);

        when(mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()).thenReturn(false);



        mScreen.transitionTo(UNINITIALIZED, INITIALIZED);

        mScreen.transitionTo(INITIALIZED, DOZE);



        assertTrue(mServiceFake.screenBrightness <= DIM_BRIGHTNESS);

    }



    @Test

    public void transitionToDoze_duringLockedScreenOff_notAfterTimeout_doesNotClampToDim() {

        when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn(

                PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON);

        when(mWakefulnessLifecycle.getWakefulness()).thenReturn(

                WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP);

        when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(false);

        when(mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()).thenReturn(false);



        mScreen.transitionTo(UNINITIALIZED, INITIALIZED);

        mScreen.transitionTo(INITIALIZED, DOZE);



        assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS);

    }



    private void waitForSensorManager() {

        mFakeExecutor.runAllReady();

    }