Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 471831c3 authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Automerger Merge Worker
Browse files

Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3 

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



Change-Id: Ic6f2ff9ad733eac976af356f564ddd860b764fb6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b18d91f7 7d634de3

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

tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java

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