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

Commit 6113d029 authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "Add config for display white balance default state" into qt-dev 

am: 8d17d4ca

Change-Id: Ib4c88c90214ab59cb62eb34e46adb13007827312
parents 7fb0b5bf 8d17d4ca

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -1032,6 +1032,9 @@ 
    <!-- Boolean indicating whether display white balance is supported. -->

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



    <!-- Boolean indicating whether display white balance should be enabled by default. -->

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



    <!-- Minimum color temperature, in Kelvin, supported by display white balance. -->

    <integer name="config_displayWhiteBalanceColorTemperatureMin">4000</integer>

core/res/res/values/symbols.xml

+1 −2
Original line number Diff line number Diff line
@@ -3150,7 +3150,6 @@ 


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

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

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

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

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

  <java-symbol type="integer" name="config_defaultNightDisplayAutoMode" />
@@ -3162,8 +3161,8 @@ 
  <java-symbol type="array" name="config_nightDisplayColorTemperatureCoefficients" />

  <java-symbol type="array" name="config_nightDisplayColorTemperatureCoefficientsNative" />

  <java-symbol type="array" name="config_availableColorModes" />



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

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

  <java-symbol type="integer" name="config_displayWhiteBalanceColorTemperatureMin" />

  <java-symbol type="integer" name="config_displayWhiteBalanceColorTemperatureMax" />

  <java-symbol type="integer" name="config_displayWhiteBalanceColorTemperatureDefault" />

services/core/java/com/android/server/display/color/ColorDisplayService.java

+8 −2
Original line number Diff line number Diff line
@@ -461,7 +461,9 @@ public final class ColorDisplayService extends SystemService { 
                    .setMatrix(mNightDisplayTintController.getColorTemperatureSetting());

        }



        if (mDisplayWhiteBalanceTintController.isAvailable(getContext())) {

            updateDisplayWhiteBalanceStatus();

        }



        final DisplayTransformManager dtm = getLocalService(DisplayTransformManager.class);

        dtm.setColorMode(mode, mNightDisplayTintController.getMatrix());
@@ -624,7 +626,11 @@ public final class ColorDisplayService extends SystemService { 
            return false;

        }

        return Secure.getIntForUser(getContext().getContentResolver(),

                Secure.DISPLAY_WHITE_BALANCE_ENABLED, 0, mCurrentUser) == 1;

                Secure.DISPLAY_WHITE_BALANCE_ENABLED,

                getContext().getResources()

                        .getBoolean(R.bool.config_displayWhiteBalanceEnabledDefault) ? 1

                        : 0,

                mCurrentUser) == 1;

    }



    private boolean isDeviceColorManagedInternal() {