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

Commit 4144ff4d authored by Peter Lin's avatar Peter Lin Committed by Android (Google) Code Review
Browse files

Merge "[RESTRICT AUTOMERGE] add normal brightness controller config" into udc-qpr-dev

parents 41772b9c e9fd5142

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -1803,6 +1803,9 @@ 
    <array name="config_screenThresholdLevels">

    </array>



    <!-- Allow normal brightness controller feature. -->

    <bool name="config_allowNormalBrightnessControllerFeature">false</bool>



    <!-- Array of hysteresis constraint values for brightening, represented as tenths of a

         percent. The length of this array is assumed to be one greater than

         config_screenThresholdLevels. The brightening threshold is calculated as

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1948,6 +1948,7 @@ 
  <java-symbol type="bool" name="config_usbChargingMessage" />

  <java-symbol type="bool" name="config_skipScreenOnBrightnessRamp" />

  <java-symbol type="bool" name="config_allowAutoBrightnessWhileDozing" />

  <java-symbol type="bool" name="config_allowNormalBrightnessControllerFeature" />

  <java-symbol type="bool" name="config_allowTheaterModeWakeFromUnplug" />

  <java-symbol type="bool" name="config_allowTheaterModeWakeFromGesture" />

  <java-symbol type="bool" name="config_allowTheaterModeWakeFromCameraLens" />

services/core/java/com/android/server/display/BrightnessRangeController.java

+10 −4
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ 


package com.android.server.display;



import android.content.res.Resources;

import android.hardware.display.BrightnessInfo;

import android.os.IBinder;

import android.provider.DeviceConfigInterface;



import com.android.internal.R;

import com.android.server.display.feature.DeviceConfigParameterProvider;



import java.io.PrintWriter;
@@ -33,20 +35,24 @@ class BrightnessRangeController { 


    private final Runnable mModeChangeCallback;

    private final boolean mUseNbmController;

    private Resources mResources;





    BrightnessRangeController(HighBrightnessModeController hbmController,

            Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig) {

            Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig,

            Resources resources) {

        this(hbmController, modeChangeCallback, displayDeviceConfig,

                new DeviceConfigParameterProvider(DeviceConfigInterface.REAL));

                new DeviceConfigParameterProvider(DeviceConfigInterface.REAL), resources);

    }



    BrightnessRangeController(HighBrightnessModeController hbmController,

            Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig,

            DeviceConfigParameterProvider configParameterProvider) {

            DeviceConfigParameterProvider configParameterProvider, Resources resources) {

        mHbmController = hbmController;

        mModeChangeCallback = modeChangeCallback;

        mUseNbmController = configParameterProvider.isNormalBrightnessControllerFeatureEnabled();

        mResources = resources;

        mUseNbmController = configParameterProvider.isNormalBrightnessControllerFeatureEnabled() ||

            resources.getBoolean(R.bool.config_allowNormalBrightnessControllerFeature);

        mNormalBrightnessModeController.resetNbmData(displayDeviceConfig.getLuxThrottlingData());

    }

services/core/java/com/android/server/display/DisplayPowerController.java

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        HighBrightnessModeController hbmController = createHbmControllerLocked(modeChangeCallback);



        mBrightnessRangeController = new BrightnessRangeController(hbmController,

                modeChangeCallback, mDisplayDeviceConfig);

                modeChangeCallback, mDisplayDeviceConfig, resources);



        mBrightnessThrottler = createBrightnessThrottlerLocked();

services/core/java/com/android/server/display/DisplayPowerController2.java

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        mBrightnessThrottler = createBrightnessThrottlerLocked();



        mBrightnessRangeController = new BrightnessRangeController(hbmController,

                modeChangeCallback, mDisplayDeviceConfig);

                modeChangeCallback, mDisplayDeviceConfig, resources);



        mDisplayBrightnessController =

                new DisplayBrightnessController(context, null,