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

Commit f3f39581 authored by Sally Yuen's avatar Sally Yuen Committed by Automerger Merge Worker
Browse files

Merge "Add configurable strength values for Reduce Bright Colors" into sc-dev am: f6b5277c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13683351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99607fd45631e03b9346b04f7458e435fcfb9df5
parents e2b52cca f6b5277c

core/java/android/hardware/display/ColorDisplayManager.java

+20 −0
Original line number Diff line number Diff line
@@ -536,6 +536,26 @@ public final class ColorDisplayManager { 
        return context.getResources().getBoolean(R.bool.config_reduceBrightColorsAvailable);

    }



    /**

     * Returns the minimum allowed brightness reduction strength in percentage when activated.

     *

     * @hide

     */

    public static int getMinimumReduceBrightColorsStrength(Context context) {

        return context.getResources()

                .getInteger(R.integer.config_reduceBrightColorsStrengthMin);

    }



    /**

     * Returns the maximum allowed brightness reduction strength in percentage when activated.

     *

     * @hide

     */

    public static int getMaximumReduceBrightColorsStrength(Context context) {

        return context.getResources()

                .getInteger(R.integer.config_reduceBrightColorsStrengthMax);

    }



    /**

     * Check if the color transforms are color accelerated. Some transforms are experimental only

     * on non-accelerated platforms due to the performance implications.

core/res/res/values/config.xml

+9 −0
Original line number Diff line number Diff line
@@ -848,6 +848,15 @@ 
        <!-- y-intercept --> <item>1.000000000000000</item>

    </string-array>



    <!-- Default strength, in percentage, of bright color reduction when activated. -->

    <integer name="config_reduceBrightColorsStrengthDefault">0</integer>



    <!-- Minimum strength, in percentage, supported by bright color reduction. -->

    <integer name="config_reduceBrightColorsStrengthMin">0</integer>



    <!-- Maximum strength, in percentage, supported by bright color reduction. -->

    <integer name="config_reduceBrightColorsStrengthMax">100</integer>



    <!-- Boolean indicating whether display white balance is supported. -->

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

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -3224,6 +3224,9 @@ 
  <java-symbol type="bool" name="config_reduceBrightColorsAvailable" />

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

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

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

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

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

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

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

  <java-symbol type="string" name="config_vendorColorModesRestoreHint" />