Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* changes:
  Merge "[DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING" into qt-qpr1-dev am: 3bc45ce2ab
  [DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING am: 4aced5d906
This commit is contained in:
Automerger Merge Worker
2020-02-11 03:52:51 +00:00
committed by Android (Google) Code Review
parent 45d4d19fc5 3c0cd40a23
commit cd9e71744e
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java
View File

@@ -161,6 +161,10 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
// again, it will only show after the brightness sensor has stabilized, // again, it will only show after the brightness sensor has stabilized,
// avoiding a potential flicker. // avoiding a potential flicker.
scrimOpacity = 255; 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) { } else if (brightnessReady) {
// Only unblank scrim once brightness is ready. // Only unblank scrim once brightness is ready.
scrimOpacity = computeScrimOpacity(sensorValue); scrimOpacity = computeScrimOpacity(sensorValue);

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

@@ -156,6 +156,20 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
assertEquals(1, mServiceFake.screenBrightness); 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 @Test
public void testDozingAfterPulsing_pausesLightSensor() throws Exception { public void testDozingAfterPulsing_pausesLightSensor() throws Exception {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED); mScreen.transitionTo(UNINITIALIZED, INITIALIZED);