Merge "Don't clamp doze brightness to auto-brightness value" into main (81e06691) · Commits · e / os / android_frameworks_base

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

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -261,6 +261,13 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
	}		}
	//TODO: brightnessfloat change usages to float.		//TODO: brightnessfloat change usages to float.
	private int clampToUserSetting(int brightness) {		private int clampToUserSetting(int brightness) {
			int screenBrightnessModeSetting = mSystemSettings.getIntForUser(
			Settings.System.SCREEN_BRIGHTNESS_MODE,
			Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL, UserHandle.USER_CURRENT);
			if (screenBrightnessModeSetting == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
			return brightness;
			}

	int userSetting = mSystemSettings.getIntForUser(		int userSetting = mSystemSettings.getIntForUser(
	Settings.System.SCREEN_BRIGHTNESS, Integer.MAX_VALUE,		Settings.System.SCREEN_BRIGHTNESS, Integer.MAX_VALUE,
	UserHandle.USER_CURRENT);		UserHandle.USER_CURRENT);

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

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -165,11 +165,27 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
	int maxBrightness = 3;		int maxBrightness = 3;
	when(mSystemSettings.getIntForUser(eq(Settings.System.SCREEN_BRIGHTNESS), anyInt(),		when(mSystemSettings.getIntForUser(eq(Settings.System.SCREEN_BRIGHTNESS), anyInt(),
	eq(UserHandle.USER_CURRENT))).thenReturn(maxBrightness);		eq(UserHandle.USER_CURRENT))).thenReturn(maxBrightness);
			when(mSystemSettings.getIntForUser(eq(Settings.System.SCREEN_BRIGHTNESS_MODE), anyInt(),
			eq(UserHandle.USER_CURRENT)))
			.thenReturn(Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);

	mScreen.transitionTo(UNINITIALIZED, INITIALIZED);		mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
	assertEquals(maxBrightness, mServiceFake.screenBrightness);		assertEquals(maxBrightness, mServiceFake.screenBrightness);
	}		}

			@Test
			public void testAod_usesLightSensorNotClampingToAutoBrightnessValue() {
			int maxBrightness = 3;
			when(mSystemSettings.getIntForUser(eq(Settings.System.SCREEN_BRIGHTNESS), anyInt(),
			eq(UserHandle.USER_CURRENT))).thenReturn(maxBrightness);
			when(mSystemSettings.getIntForUser(eq(Settings.System.SCREEN_BRIGHTNESS_MODE), anyInt(),
			eq(UserHandle.USER_CURRENT)))
			.thenReturn(Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);

			mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
			assertEquals(DEFAULT_BRIGHTNESS, mServiceFake.screenBrightness);
			}

	@Test		@Test
	public void doze_doesNotUseLightSensor() {		public void doze_doesNotUseLightSensor() {
	// GIVEN the device is DOZE and the display state changes to ON		// GIVEN the device is DOZE and the display state changes to ON