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

Commit 4aced5d9 authored by Chris.CC Lee's avatar Chris.CC Lee
Browse files

[DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING 

When doze state changed from DOZE to DOZE_PULSING on devices not
supporting doze_brightness_sensor_type sensor, there would be no
sensor events to update the AoD front scrim. And due to the scrim was
set to opaque at DOZE state, most views on the statusbar will be
invisible. This patch change the scrim to transparent again at leaving
DOZE state.

Bug: 148129743
Test: atest DozeScreenBrightnessTest
Change-Id: I1cf9d02c9e35dcb3e94cbbc24fec483c51e372d9
parent 6c3cdcc7

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

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi 
                // again, it will only show after the brightness sensor has stabilized,

                // avoiding a potential flicker.

                scrimOpacity = 255;

            } else if (!mScreenOff && mLightSensor == null) {

                // No light sensor but previous state turned the screen black. Make the scrim

                // transparent and below views visible.

                scrimOpacity = 0;

            } else if (brightnessReady) {

                // Only unblank scrim once brightness is ready.

                scrimOpacity = computeScrimOpacity(sensorValue);

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

+14 −0
Original line number Diff line number Diff line
@@ -156,6 +156,20 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
        assertEquals(1, mServiceFake.screenBrightness);

    }



    @Test

    public void testPulsing_withoutLightSensor_setsAoDDimmingScrimTransparent() throws Exception {

        mScreen = new DozeScreenBrightness(mContext, mServiceFake, mSensorManager,

                null /* sensor */, mHostFake, null /* handler */,

                DEFAULT_BRIGHTNESS, SENSOR_TO_BRIGHTNESS, SENSOR_TO_OPACITY,

                true /* debuggable */);

        mScreen.transitionTo(UNINITIALIZED, INITIALIZED);

        mScreen.transitionTo(INITIALIZED, DOZE);



        mScreen.transitionTo(DOZE, DOZE_REQUEST_PULSE);



        assertEquals(0f, mHostFake.aodDimmingScrimOpacity, 0.001f /* delta */);

    }



    @Test

    public void testDozingAfterPulsing_pausesLightSensor() throws Exception {

        mScreen.transitionTo(UNINITIALIZED, INITIALIZED);