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

Commit 3d67f4a0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add information about brightness config to slider events."

parents faf85253 53d0661f

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -1147,11 +1147,14 @@ package android.hardware.display { 
    field public final float batteryLevel;

    field public final float brightness;

    field public final int colorTemperature;

    field public final boolean isDefaultBrightnessConfig;

    field public final boolean isUserSetBrightness;

    field public final float lastBrightness;

    field public final long[] luxTimestamps;

    field public final float[] luxValues;

    field public final boolean nightMode;

    field public final java.lang.String packageName;

    field public final float powerBrightnessFactor;

    field public final long timeStamp;

  }

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -305,11 +305,14 @@ package android.hardware.display { 
    field public final float batteryLevel;

    field public final float brightness;

    field public final int colorTemperature;

    field public final boolean isDefaultBrightnessConfig;

    field public final boolean isUserSetBrightness;

    field public final float lastBrightness;

    field public final long[] luxTimestamps;

    field public final float[] luxValues;

    field public final boolean nightMode;

    field public final java.lang.String packageName;

    field public final float powerBrightnessFactor;

    field public final long timeStamp;

  }

core/java/android/hardware/display/BrightnessChangeEvent.java

+48 −3
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ public final class BrightnessChangeEvent implements Parcelable { 
    /** Most recent battery level when brightness was changed or Float.NaN */

    public final float batteryLevel;



    /** Factor applied to brightness due to battery level, 0.0-1.0 */

    public final float powerBrightnessFactor;



    /** Color filter active to provide night mode */

    public final boolean nightMode;
@@ -63,10 +66,18 @@ public final class BrightnessChangeEvent implements Parcelable { 
    /** Brightness level before slider adjustment */

    public final float lastBrightness;



    /** Whether brightness configuration is default version */

    public final boolean isDefaultBrightnessConfig;



    /** Whether brightness curve includes a user brightness point */

    public final boolean isUserSetBrightness;





    /** @hide */

    private BrightnessChangeEvent(float brightness, long timeStamp, String packageName,

            int userId, float[] luxValues, long[] luxTimestamps, float batteryLevel,

            boolean nightMode, int colorTemperature, float lastBrightness) {

            float powerBrightnessFactor, boolean nightMode, int colorTemperature,

            float lastBrightness, boolean isDefaultBrightnessConfig, boolean isUserSetBrightness) {

        this.brightness = brightness;

        this.timeStamp = timeStamp;

        this.packageName = packageName;
@@ -74,9 +85,12 @@ public final class BrightnessChangeEvent implements Parcelable { 
        this.luxValues = luxValues;

        this.luxTimestamps = luxTimestamps;

        this.batteryLevel = batteryLevel;

        this.powerBrightnessFactor = powerBrightnessFactor;

        this.nightMode = nightMode;

        this.colorTemperature = colorTemperature;

        this.lastBrightness = lastBrightness;

        this.isDefaultBrightnessConfig = isDefaultBrightnessConfig;

        this.isUserSetBrightness = isUserSetBrightness;

    }



    /** @hide */
@@ -88,9 +102,12 @@ public final class BrightnessChangeEvent implements Parcelable { 
        this.luxValues = other.luxValues;

        this.luxTimestamps = other.luxTimestamps;

        this.batteryLevel = other.batteryLevel;

        this.powerBrightnessFactor = other.powerBrightnessFactor;

        this.nightMode = other.nightMode;

        this.colorTemperature = other.colorTemperature;

        this.lastBrightness = other.lastBrightness;

        this.isDefaultBrightnessConfig = other.isDefaultBrightnessConfig;

        this.isUserSetBrightness = other.isUserSetBrightness;

    }



    private BrightnessChangeEvent(Parcel source) {
@@ -101,9 +118,12 @@ public final class BrightnessChangeEvent implements Parcelable { 
        luxValues = source.createFloatArray();

        luxTimestamps = source.createLongArray();

        batteryLevel = source.readFloat();

        powerBrightnessFactor = source.readFloat();

        nightMode = source.readBoolean();

        colorTemperature = source.readInt();

        lastBrightness = source.readFloat();

        isDefaultBrightnessConfig = source.readBoolean();

        isUserSetBrightness = source.readBoolean();

    }



    public static final Creator<BrightnessChangeEvent> CREATOR =
@@ -130,9 +150,12 @@ public final class BrightnessChangeEvent implements Parcelable { 
        dest.writeFloatArray(luxValues);

        dest.writeLongArray(luxTimestamps);

        dest.writeFloat(batteryLevel);

        dest.writeFloat(powerBrightnessFactor);

        dest.writeBoolean(nightMode);

        dest.writeInt(colorTemperature);

        dest.writeFloat(lastBrightness);

        dest.writeBoolean(isDefaultBrightnessConfig);

        dest.writeBoolean(isUserSetBrightness);

    }



    /** @hide */
@@ -144,9 +167,12 @@ public final class BrightnessChangeEvent implements Parcelable { 
        private float[] mLuxValues;

        private long[] mLuxTimestamps;

        private float mBatteryLevel;

        private float mPowerBrightnessFactor;

        private boolean mNightMode;

        private int mColorTemperature;

        private float mLastBrightness;

        private boolean mIsDefaultBrightnessConfig;

        private boolean mIsUserSetBrightness;



        /** {@see BrightnessChangeEvent#brightness} */

        public Builder setBrightness(float brightness) {
@@ -190,6 +216,12 @@ public final class BrightnessChangeEvent implements Parcelable { 
            return this;

        }



        /** {@see BrightnessChangeEvent#powerSaveBrightness} */

        public Builder setPowerBrightnessFactor(float powerBrightnessFactor) {

            mPowerBrightnessFactor = powerBrightnessFactor;

            return this;

        }



        /** {@see BrightnessChangeEvent#nightMode} */

        public Builder setNightMode(boolean nightMode) {

            mNightMode = nightMode;
@@ -208,11 +240,24 @@ public final class BrightnessChangeEvent implements Parcelable { 
            return this;

        }



        /** {@see BrightnessChangeEvent#isDefaultBrightnessConfig} */

        public Builder setIsDefaultBrightnessConfig(boolean isDefaultBrightnessConfig) {

            mIsDefaultBrightnessConfig = isDefaultBrightnessConfig;

            return this;

        }



        /** {@see BrightnessChangeEvent#userBrightnessPoint} */

        public Builder setUserBrightnessPoint(boolean isUserSetBrightness) {

            mIsUserSetBrightness = isUserSetBrightness;

            return this;

        }



        /** Builds a BrightnessChangeEvent */

        public BrightnessChangeEvent build() {

            return new BrightnessChangeEvent(mBrightness, mTimeStamp,

                    mPackageName, mUserId, mLuxValues, mLuxTimestamps, mBatteryLevel,

                    mNightMode, mColorTemperature, mLastBrightness);

                    mPowerBrightnessFactor, mNightMode, mColorTemperature, mLastBrightness,

                    mIsDefaultBrightnessConfig, mIsUserSetBrightness);

        }

    }

}

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

+8 −0
Original line number Diff line number Diff line
@@ -269,6 +269,14 @@ class AutomaticBrightnessController { 
        }

    }



    public boolean hasUserDataPoints() {

        return mBrightnessMapper.hasUserDataPoints();

    }



    public boolean isDefaultConfig() {

        return mBrightnessMapper.isDefaultConfig();

    }



    private boolean setDisplayPolicy(int policy) {

        if (mDisplayPolicy == policy) {

            return false;

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

+26 −0
Original line number Diff line number Diff line
@@ -200,6 +200,12 @@ public abstract class BrightnessMappingStrategy { 
     */

    public abstract void clearUserDataPoints();



    /** @return true if there are any short term adjustments applied to the curve */

    public abstract boolean hasUserDataPoints();



    /** @return true if the current brightness config is the default one */

    public abstract boolean isDefaultConfig();



    public abstract void dump(PrintWriter pw);



    private static float normalizeAbsoluteBrightness(int brightness) {
@@ -389,6 +395,16 @@ public abstract class BrightnessMappingStrategy { 
            }

        }



        @Override

        public boolean hasUserDataPoints() {

            return mUserLux != -1;

        }



        @Override

        public boolean isDefaultConfig() {

            return true;

        }



        @Override

        public void dump(PrintWriter pw) {

            pw.println("SimpleMappingStrategy");
@@ -506,6 +522,16 @@ public abstract class BrightnessMappingStrategy { 
            }

        }



        @Override

        public boolean hasUserDataPoints() {

            return mUserLux != -1;

        }



        @Override

        public boolean isDefaultConfig() {

            return mDefaultConfig.equals(mConfig);

        }



        @Override

        public void dump(PrintWriter pw) {

            pw.println("PhysicalMappingStrategy");