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

Commit cd9e7174 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-90f3bc3d5bbe49498428b40defa6b5a1" into qt-qpr1-dev-plus-aosp 

* changes:
  Merge "[DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING" into qt-qpr1-dev am: 3bc45ce2
  [DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING am: 4aced5d9
parents 45d4d19f 3c0cd40a

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);