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

Commit ca44caa6 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Update brightness percentage display logic to match sysui." into pi-dev am: 69d12406 

am: e9045a7a

Change-Id: I20c27b31caa7a44b6d114780a0b7b18206f75d12
parents 8118c8d7 e9045a7a

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

+19 −12
Original line number Original line Diff line number Diff line
@@ -13,6 +13,9 @@ 
 */

 */

package com.android.settings.display;

package com.android.settings.display;





import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX;

import static com.android.settingslib.display.BrightnessUtils.convertLinearToGamma;



import android.content.ContentResolver;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Context;

import android.database.ContentObserver;

import android.database.ContentObserver;
@@ -103,6 +106,7 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr 
    public void updateState(Preference preference) {

    public void updateState(Preference preference) {

        updatedSummary(preference);

        updatedSummary(preference);

    }

    }



    @Override

    @Override

    public void onStart() {

    public void onStart() {

        mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver);

        mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver);
@@ -122,15 +126,18 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr 
    }

    }





    private double getCurrentBrightness() {

    private double getCurrentBrightness() {

        final int value;

        if (isInVrMode()) {

        if (isInVrMode()) {

            final double value = System.getInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR,

            value = convertLinearToGamma(System.getInt(mContentResolver,

                    mMaxBrightness);

                    System.SCREEN_BRIGHTNESS_FOR_VR, mMaxBrightness),

            return getPercentage(value, mMinVrBrightness, mMaxVrBrightness);

                    mMinVrBrightness, mMaxVrBrightness);

        } else {

        } else {

            final double value = Settings.System.getInt(mContentResolver, System.SCREEN_BRIGHTNESS,

            value = convertLinearToGamma(Settings.System.getInt(mContentResolver,

                    mMinBrightness);

                    System.SCREEN_BRIGHTNESS, mMinBrightness),

            return getPercentage(value, mMinBrightness, mMaxBrightness);

                    mMinBrightness, mMaxBrightness);



        }

        }

        return getPercentage(value, 0, GAMMA_SPACE_MAX);

    }

    }





    private double getPercentage(double value, int min, int max) {

    private double getPercentage(double value, int min, int max) {

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -122,7 +122,7 @@ public class BrightnessLevelPreferenceControllerTest { 




        mController.updateState(mPreference);

        mController.updateState(mPreference);





        verify(mPreference).setSummary("85%");

        verify(mPreference).setSummary("97%");

    }

    }





    @Test

    @Test
@@ -135,7 +135,7 @@ public class BrightnessLevelPreferenceControllerTest { 




        mController.updateState(mPreference);

        mController.updateState(mPreference);





        verify(mPreference).setSummary("31%");

        verify(mPreference).setSummary("78%");

    }

    }





    @Test

    @Test
@@ -148,7 +148,7 @@ public class BrightnessLevelPreferenceControllerTest { 




        mController.updateState(mPreference);

        mController.updateState(mPreference);





        verify(mPreference).setSummary("45%");

        verify(mPreference).setSummary("85%");

    }

    }





    @Test

    @Test