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

Commit 183063af authored by Kenny Guy's avatar Kenny Guy Committed by Android (Google) Code Review
Browse files

Merge "Update brightness configuration per API review."

parents 50772e9b cae6c351

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2519,7 +2519,7 @@ package android.hardware.display { 
    method @Nullable public android.hardware.display.BrightnessCorrection getCorrectionByPackageName(@NonNull String);

    method public android.util.Pair<float[],float[]> getCurve();

    method public float getShortTermModelLowerLuxMultiplier();

    method public long getShortTermModelTimeout();

    method public long getShortTermModelTimeoutMillis();

    method public float getShortTermModelUpperLuxMultiplier();

    method public boolean shouldCollectColorSamples();

    method public void writeToParcel(android.os.Parcel, int);
@@ -2536,7 +2536,7 @@ package android.hardware.display { 
    method public int getMaxCorrectionsByPackageName();

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setDescription(@Nullable String);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelLowerLuxMultiplier(@FloatRange(from=0.0f) float);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelTimeout(long);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelTimeoutMillis(long);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelUpperLuxMultiplier(@FloatRange(from=0.0f) float);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShouldCollectColorSamples(boolean);

  }

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ package android.hardware.display { 
    method @Nullable public android.hardware.display.BrightnessCorrection getCorrectionByPackageName(@NonNull String);

    method public android.util.Pair<float[],float[]> getCurve();

    method public float getShortTermModelLowerLuxMultiplier();

    method public long getShortTermModelTimeout();

    method public long getShortTermModelTimeoutMillis();

    method public float getShortTermModelUpperLuxMultiplier();

    method public boolean shouldCollectColorSamples();

    method public void writeToParcel(android.os.Parcel, int);
@@ -1108,7 +1108,7 @@ package android.hardware.display { 
    method public int getMaxCorrectionsByPackageName();

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setDescription(@Nullable String);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelLowerLuxMultiplier(@FloatRange(from=0.0f) float);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelTimeout(long);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelTimeoutMillis(long);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelUpperLuxMultiplier(@FloatRange(from=0.0f) float);

    method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShouldCollectColorSamples(boolean);

  }

core/java/android/hardware/display/BrightnessConfiguration.java

+6 −6
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public final class BrightnessConfiguration implements Parcelable { 
    private static final String ATTR_MODEL_LOWER_BOUND = "model-lower-bound";

    private static final String ATTR_MODEL_UPPER_BOUND = "model-upper-bound";

    /**

     * Returned from {@link #getShortTermModelTimeout()} if no timeout has been set.

     * Returned from {@link #getShortTermModelTimeoutMillis()} if no timeout has been set.

     * In this case the device will use the default timeout available in the

     * {@link BrightnessConfiguration} returned from

     * {@link DisplayManager#getDefaultBrightnessConfiguration()}.
@@ -160,7 +160,7 @@ public final class BrightnessConfiguration implements Parcelable { 
     * {@link #getShortTermModelUpperLuxMultiplier()} to decide whether to keep any adjustment

     * the user has made to adaptive brightness.

     */

    public long getShortTermModelTimeout() {

    public long getShortTermModelTimeoutMillis() {

        return mShortTermModelTimeout;

    }
@@ -326,7 +326,7 @@ public final class BrightnessConfiguration implements Parcelable { 
            builder.setDescription(description);

            final boolean shouldCollectColorSamples = in.readBoolean();

            builder.setShouldCollectColorSamples(shouldCollectColorSamples);

            builder.setShortTermModelTimeout(in.readLong());

            builder.setShortTermModelTimeoutMillis(in.readLong());

            builder.setShortTermModelLowerLuxMultiplier(in.readFloat());

            builder.setShortTermModelUpperLuxMultiplier(in.readFloat());

            return builder.build();
@@ -487,7 +487,7 @@ public final class BrightnessConfiguration implements Parcelable { 
            builder.addCorrectionByCategory(category, correction);

        }

        builder.setShouldCollectColorSamples(shouldCollectColorSamples);

        builder.setShortTermModelTimeout(shortTermModelTimeout);

        builder.setShortTermModelTimeoutMillis(shortTermModelTimeout);

        builder.setShortTermModelLowerLuxMultiplier(shortTermModelLowerLuxMultiplier);

        builder.setShortTermModelUpperLuxMultiplier(shortTermModelUpperLuxMultiplier);

        return builder.build();
@@ -673,8 +673,8 @@ public final class BrightnessConfiguration implements Parcelable { 
         * adjustment the user has made to adaptive brightness.

         */

        @NonNull

        public Builder setShortTermModelTimeout(long shortTermModelTimeout) {

            mShortTermModelTimeout = shortTermModelTimeout;

        public Builder setShortTermModelTimeoutMillis(long shortTermModelTimeoutMillis) {

            mShortTermModelTimeout = shortTermModelTimeoutMillis;

            return this;

        }

core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java

+3 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class BrightnessConfigurationTest { 
        BrightnessConfiguration.Builder builder =

                new BrightnessConfiguration.Builder(LUX_LEVELS, NITS_LEVELS);

        builder.setShouldCollectColorSamples(true);

        builder.setShortTermModelTimeout(1234L);

        builder.setShortTermModelTimeoutMillis(1234L);

        builder.setShortTermModelLowerLuxMultiplier(0.9f);

        builder.setShortTermModelUpperLuxMultiplier(0.2f);

        builder.addCorrectionByCategory(3,
@@ -153,7 +153,7 @@ public class BrightnessConfigurationTest { 
        BrightnessConfiguration.Builder builder =

                new BrightnessConfiguration.Builder(LUX_LEVELS, NITS_LEVELS);

        builder.setShouldCollectColorSamples(true);

        builder.setShortTermModelTimeout(123L);

        builder.setShortTermModelTimeoutMillis(123L);

        builder.setShortTermModelLowerLuxMultiplier(0.4f);

        builder.setShortTermModelUpperLuxMultiplier(0.8f);

        builder.addCorrectionByCategory(3,
@@ -236,7 +236,7 @@ public class BrightnessConfigurationTest { 
        assertNotEquals(baseConfig, colorCollectionDiffers);



        builder = new BrightnessConfiguration.Builder(LUX_LEVELS, NITS_LEVELS);

        builder.setShortTermModelTimeout(300L);

        builder.setShortTermModelTimeoutMillis(300L);

        BrightnessConfiguration timeoutDiffers = builder.build();

        assertNotEquals(baseConfig, timeoutDiffers);

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

+4 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public abstract class BrightnessMappingStrategy { 
            }

            BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(

                    luxLevels, brightnessLevelsNits);

            builder.setShortTermModelTimeout(shortTermModelTimeout);

            builder.setShortTermModelTimeoutMillis(shortTermModelTimeout);

            builder.setShortTermModelLowerLuxMultiplier(SHORT_TERM_MODEL_THRESHOLD_RATIO);

            builder.setShortTermModelUpperLuxMultiplier(SHORT_TERM_MODEL_THRESHOLD_RATIO);

            return new PhysicalMappingStrategy(builder.build(), nitsRange, backlightRange,
@@ -739,10 +739,10 @@ public abstract class BrightnessMappingStrategy { 


        @Override

        public long getShortTermModelTimeout() {

            if (mConfig.getShortTermModelTimeout() >= 0) {

                return mConfig.getShortTermModelTimeout();

            if (mConfig.getShortTermModelTimeoutMillis() >= 0) {

                return mConfig.getShortTermModelTimeoutMillis();

            } else {

                return mDefaultConfig.getShortTermModelTimeout();

                return mDefaultConfig.getShortTermModelTimeoutMillis();

            }

        }