Snap for 6198998 from 94431615b181530cea2ccc34e45281ad39b018e1 to qt-qpr3-release (9ef7d783) · Commits · e / os / android_frameworks_base

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/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,8 @@ public class KeyguardIndicationController implements StateListener,
		mStatusBarStateController = statusBarStateController;
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		mDockManager = dockManager;
		mDockManager.addAlignmentStateListener(this::handleAlignStateChanged);
		mDockManager.addAlignmentStateListener(
		alignState -> mHandler.post(() -> handleAlignStateChanged(alignState)));
		// lock icon is not used on all form factors.
		if (mLockIcon != null) {
		mLockIcon.setOnLongClickListener(this::handleLockLongClick);

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

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+30 −20

Original line number	Diff line number	Diff line
		@@ -223,12 +223,14 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {

		@Test
		public void onAlignmentStateChanged_showsSlowChargingIndication() {
		mInstrumentation.runOnMainSync(() -> {
		createController();
		verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture());
		mController.setVisible(true);

		mAlignmentListener.getValue().onAlignmentStateChanged(
		DockManager.ALIGN_STATE_POOR);
		mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_POOR);
		});
		mInstrumentation.waitForIdleSync();

		assertThat(mTextView.getText()).isEqualTo(
		mContext.getResources().getString(R.string.dock_alignment_slow_charging));
		@@ -238,11 +240,14 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {

		@Test
		public void onAlignmentStateChanged_showsNotChargingIndication() {
		mInstrumentation.runOnMainSync(() -> {
		createController();
		verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture());
		mController.setVisible(true);

		mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_TERRIBLE);
		});
		mInstrumentation.waitForIdleSync();

		assertThat(mTextView.getText()).isEqualTo(
		mContext.getResources().getString(R.string.dock_alignment_not_charging));
		@@ -252,13 +257,15 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {

		@Test
		public void onAlignmentStateChanged_whileDozing_showsSlowChargingIndication() {
		mInstrumentation.runOnMainSync(() -> {
		createController();
		verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture());
		mController.setVisible(true);
		mController.setDozing(true);

		mAlignmentListener.getValue().onAlignmentStateChanged(
		DockManager.ALIGN_STATE_POOR);
		mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_POOR);
		});
		mInstrumentation.waitForIdleSync();

		assertThat(mTextView.getText()).isEqualTo(
		mContext.getResources().getString(R.string.dock_alignment_slow_charging));
		@@ -268,12 +275,15 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {

		@Test
		public void onAlignmentStateChanged_whileDozing_showsNotChargingIndication() {
		mInstrumentation.runOnMainSync(() -> {
		createController();
		verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture());
		mController.setVisible(true);
		mController.setDozing(true);

		mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_TERRIBLE);
		});
		mInstrumentation.waitForIdleSync();

		assertThat(mTextView.getText()).isEqualTo(
		mContext.getResources().getString(R.string.dock_alignment_not_charging));