Merge "Notify about brightness change when screen turns on" into tm-dev (7d634de3) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/display/BrightnessLevelPreferenceController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,7 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
		mContentResolver.registerContentObserver(BRIGHTNESS_ADJ_URI, false, mBrightnessObserver);
		mDisplayManager.registerDisplayListener(mDisplayListener, mHandler,
		DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS);
		updatedSummary(mPreference);
		}

		@Override

+15 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,21 @@ public class BrightnessLevelPreferenceControllerTest {
		System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ))).isEmpty();
		}

		@Test
		public void onStart_shouldSetSummary() {
		BrightnessLevelPreferenceController controller =
		new BrightnessLevelPreferenceController(mContext, null);
		controller.displayPreference(mScreen);

		controller.onStop();
		when(mDisplay.getBrightnessInfo()).thenReturn(
		new BrightnessInfo(0.5f, 0.0f, 1.0f, BrightnessInfo.HIGH_BRIGHTNESS_MODE_OFF,
		0.5f, BrightnessInfo.BRIGHTNESS_MAX_REASON_NONE));
		controller.onStart();

		verify(mPreference).setSummary("87%");
		}

		@Test
		public void updateState_inVrMode_shouldSetSummaryToVrBrightness() {
		doReturn(true).when(mController).isInVrMode();