From a26381aa85cf16b56b0cff181771aa3812ca6611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wilczy=C5=84ski?= Date: Fri, 22 Apr 2022 09:41:37 +0000 Subject: [PATCH] Notify about brightness change when screen turns on Bug: 216419091 Test: ROBOTEST_FILTER=BrightnessLevelPreferenceControllerTest m -j RunSettingsRoboTests Change-Id: I35f4b81b325a7275ad7391aa631d183ddcbd8fe3 --- .../BrightnessLevelPreferenceController.java | 1 + .../BrightnessLevelPreferenceControllerTest.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index 171f4261561..2d549fcd2a9 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -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 diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index c2a8611ec02..82c6b709076 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -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();