PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1 am: 6dac1ca43d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I0bad5912a12ae7fb19dd84b26a8cc9328ee99e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Piotr Wilczyński
2022-06-09 10:35:14 +00:00
committed by Automerger Merge Worker
parent 224aaac5da 6dac1ca43d
commit 179f00b9ef
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/display/BrightnessLevelPreferenceController.java
View File

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

15
tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
View File

@@ -135,6 +135,21 @@ public class BrightnessLevelPreferenceControllerTest {
System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ))).isEmpty(); 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 @Test
public void updateState_inVrMode_shouldSetSummaryToVrBrightness() { public void updateState_inVrMode_shouldSetSummaryToVrBrightness() {
doReturn(true).when(mController).isInVrMode(); doReturn(true).when(mController).isInVrMode();