Snap for 6294165 from 5fe2090213998365af682442da1a313bbdce317e to qt-qpr3-release (c29179e6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -588,9 +588,9 @@ public class ScreenDecorations extends SystemUI implements Tunable,
		mRoundedDefaultTop = newRoundedDefaultTop;
		mRoundedDefaultBottom = newRoundedDefaultBottom;
		}
		}
		onTuningChanged(SIZE, null);
		}
		}

		private void updateViews() {
		View topLeft = mOverlay.findViewById(R.id.left);

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -155,15 +155,8 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
		}

		int scrimOpacity = -1;
		if (mPaused \|\| mScreenOff) {
		// If AOD is paused, force the screen black until the
		// sensor reports a new brightness. This ensures that when the screen comes on
		// 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.
		if (mLightSensor == null) {
		// No light sensor, scrims are always transparent.
		scrimOpacity = 0;
		} else if (brightnessReady) {
		// Only unblank scrim once brightness is ready.

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

+0 −42

Original line number	Diff line number	Diff line
		@@ -220,48 +220,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
		assertEquals(10/255f, mHostFake.aodDimmingScrimOpacity, 0.001f /* delta */);
		}

		@Test
		public void pausingAod_softBlanks() throws Exception {
		mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
		mScreen.transitionTo(INITIALIZED, DOZE_AOD);

		mSensor.sendSensorEvent(2);

		mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSING);
		mScreen.transitionTo(DOZE_AOD_PAUSING, DOZE_AOD_PAUSED);

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

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

		mScreen.transitionTo(DOZE_AOD_PAUSED, DOZE_AOD);
		assertEquals(1f, mHostFake.aodDimmingScrimOpacity, 0.001f /* delta */);
		}

		@Test
		public void pausingAod_softBlanks_withSpuriousSensorDuringPause() throws Exception {
		mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
		mScreen.transitionTo(INITIALIZED, DOZE_AOD);
		mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSING);
		mScreen.transitionTo(DOZE_AOD_PAUSING, DOZE_AOD_PAUSED);

		mSensor.sendSensorEvent(1);
		assertEquals(1f, mHostFake.aodDimmingScrimOpacity, 0.001f /* delta */);
		}

		@Test
		public void screenOff_softBlanks() throws Exception {
		mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
		mScreen.transitionTo(INITIALIZED, DOZE_AOD);
		mScreen.transitionTo(DOZE_AOD, DOZE);
		assertEquals(1f, mHostFake.aodDimmingScrimOpacity, 0.001f /* delta */);

		mScreen.transitionTo(DOZE, DOZE_AOD);
		mSensor.sendSensorEvent(2);
		assertEquals(0f, mHostFake.aodDimmingScrimOpacity, 0.001f /* delta */);
		}

		@Test
		public void pausingAod_unblanksAfterSensor() throws Exception {
		mScreen.transitionTo(UNINITIALIZED, INITIALIZED);