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

Commit 3ae6ae4c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7796451 from 250448c0 to sc-qpr1-release 

Change-Id: I5e48f86ac700b2c10feb07688fb410cf91b58e8e
parents 7eaac6f0 250448c0

core/java/android/hardware/display/BrightnessInfo.java

+20 −1
Original line number Diff line number Diff line
@@ -60,12 +60,18 @@ public final class BrightnessInfo implements Parcelable { 
    /** Brightness */

    public final float brightness;



    /** Brightness after {@link DisplayPowerController} adjustments */

    public final float adjustedBrightness;



    /** Current minimum supported brightness. */

    public final float brightnessMinimum;



    /** Current maximum supported brightness. */

    public final float brightnessMaximum;



    /** Brightness values greater than this point are only used in High Brightness Mode. */

    public final float highBrightnessTransitionPoint;



    /**

     * Current state of high brightness mode.

     * Can be any of HIGH_BRIGHTNESS_MODE_* values.
@@ -73,11 +79,20 @@ public final class BrightnessInfo implements Parcelable { 
    public final int highBrightnessMode;



    public BrightnessInfo(float brightness, float brightnessMinimum, float brightnessMaximum,

            @HighBrightnessMode int highBrightnessMode) {

            @HighBrightnessMode int highBrightnessMode, float highBrightnessTransitionPoint) {

        this(brightness, brightness, brightnessMinimum, brightnessMaximum, highBrightnessMode,

                highBrightnessTransitionPoint);

    }



    public BrightnessInfo(float brightness, float adjustedBrightness, float brightnessMinimum,

            float brightnessMaximum, @HighBrightnessMode int highBrightnessMode,

            float highBrightnessTransitionPoint) {

        this.brightness = brightness;

        this.adjustedBrightness = adjustedBrightness;

        this.brightnessMinimum = brightnessMinimum;

        this.brightnessMaximum = brightnessMaximum;

        this.highBrightnessMode = highBrightnessMode;

        this.highBrightnessTransitionPoint = highBrightnessTransitionPoint;

    }



    /**
@@ -103,9 +118,11 @@ public final class BrightnessInfo implements Parcelable { 
    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeFloat(brightness);

        dest.writeFloat(adjustedBrightness);

        dest.writeFloat(brightnessMinimum);

        dest.writeFloat(brightnessMaximum);

        dest.writeInt(highBrightnessMode);

        dest.writeFloat(highBrightnessTransitionPoint);

    }



    public static final @android.annotation.NonNull Creator<BrightnessInfo> CREATOR =
@@ -123,9 +140,11 @@ public final class BrightnessInfo implements Parcelable { 


    private BrightnessInfo(Parcel source) {

        brightness = source.readFloat();

        adjustedBrightness = source.readFloat();

        brightnessMinimum = source.readFloat();

        brightnessMaximum = source.readFloat();

        highBrightnessMode = source.readInt();

        highBrightnessTransitionPoint = source.readFloat();

    }



}

core/java/android/text/TextLine.java

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ public class TextLine { 


        int spanStart = runStart;

        int spanLimit;

        if (mSpanned == null) {

        if (mSpanned == null || runStart == runLimit) {

            spanLimit = runLimit;

        } else {

            int target = after ? offset + 1 : offset;

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -248,6 +248,8 @@ 
        android:name="com.android.bluetooth.BluetoothMapContentObserver.action.MESSAGE_DELIVERY" />

    <protected-broadcast

        android:name="android.bluetooth.pan.profile.action.CONNECTION_STATE_CHANGED" />

    <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_CONNECTION_STATE_CHANGED" />

    <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_ACTIVE_DEVICE_CHANGED" />

    <protected-broadcast

        android:name="android.bluetooth.action.TETHERING_STATE_CHANGED" />

    <protected-broadcast android:name="android.bluetooth.pbap.profile.action.CONNECTION_STATE_CHANGED" />

core/res/res/anim-ldrtl/task_close_exit.xml

+1 −6
Original line number Diff line number Diff line
@@ -28,9 +28,4 @@ 
        android:startOffset="0"

        android:duration="500"/>



    <!-- This is needed to keep the animation running while task_open_enter completes -->

    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="1.0"

        android:duration="600"/>

</set>

core/res/res/anim-ldrtl/task_open_exit.xml

+1 −6
Original line number Diff line number Diff line
@@ -28,9 +28,4 @@ 
        android:startOffset="0"

        android:duration="500"/>



    <!-- This is needed to keep the animation running while task_open_enter completes -->

    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="1.0"

        android:duration="600"/>

</set>