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

Commit 0b54b9bf authored by Kriti Dang's avatar Kriti Dang
Browse files

Store the HDR Conversion mode setting to Global settings 

Bug: 251168516
Test: atest android.display.cts.HdrConversionTest
Change-Id: I8367aab1bcc2c361a48c4aae7314d3ad5bff70c1
parent 32338521

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2395,6 +2395,8 @@ package android.provider { 
    field public static final String DISABLE_WINDOW_BLURS = "disable_window_blurs";

    field public static final String DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD = "dynamic_power_savings_disable_threshold";

    field public static final String DYNAMIC_POWER_SAVINGS_ENABLED = "dynamic_power_savings_enabled";

    field public static final String HDR_CONVERSION_MODE = "hdr_conversion_mode";

    field public static final String HDR_FORCE_CONVERSION_TYPE = "hdr_force_conversion_type";

    field public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS = "hidden_api_blacklist_exemptions";

    field public static final String HIDDEN_API_POLICY = "hidden_api_policy";

    field public static final String HIDE_ERROR_DIALOGS = "hide_error_dialogs";

core/api/test-lint-baseline.txt

+4 −0
Original line number Diff line number Diff line
@@ -855,6 +855,10 @@ NoSettingsProvider: android.provider.Settings.Global#DYNAMIC_POWER_SAVINGS_DISAB 
    New setting keys are not allowed (Field: DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD); use getters/setters in relevant manager class

NoSettingsProvider: android.provider.Settings.Global#DYNAMIC_POWER_SAVINGS_ENABLED:

    New setting keys are not allowed (Field: DYNAMIC_POWER_SAVINGS_ENABLED); use getters/setters in relevant manager class

NoSettingsProvider: android.provider.Settings.Global#HDR_CONVERSION_MODE:

    New setting keys are not allowed (Field: HDR_CONVERSION_MODE); use getters/setters in relevant manager class

NoSettingsProvider: android.provider.Settings.Global#HDR_FORCE_CONVERSION_TYPE:

    New setting keys are not allowed (Field: HDR_FORCE_CONVERSION_TYPE); use getters/setters in relevant manager class

NoSettingsProvider: android.provider.Settings.Global#HIDDEN_API_BLACKLIST_EXEMPTIONS:

    New setting keys are not allowed (Field: HIDDEN_API_BLACKLIST_EXEMPTIONS); use getters/setters in relevant manager class

NoSettingsProvider: android.provider.Settings.Global#HIDDEN_API_POLICY:

core/java/android/hardware/display/HdrConversionMode.java

+38 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.hardware.display; 


import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -119,4 +120,40 @@ public final class HdrConversionMode implements Parcelable { 
        dest.writeInt(mConversionMode);

        dest.writeInt(mPreferredHdrOutputType);

    }



    @Override

    public boolean equals(@Nullable Object o) {

        return o instanceof HdrConversionMode && equals((HdrConversionMode) o);

    }



    @Override

    public int hashCode() {

        return 0; // don't care

    }



    @Override

    public String toString() {

        return "HdrConversionMode{ConversionMode=" + hdrConversionModeString(getConversionMode())

                + ", PreferredHdrOutputType="

                + Display.HdrCapabilities.hdrTypeToString(getPreferredHdrOutputType()) + "}";

    }



    private boolean equals(HdrConversionMode other) {

        return other != null

                && mConversionMode == other.getConversionMode()

                && mPreferredHdrOutputType == other.getPreferredHdrOutputType();

    }



    private static String hdrConversionModeString(int hdrConversionMode) {

        switch (hdrConversionMode) {

            case HDR_CONVERSION_PASSTHROUGH:

                return "HDR_CONVERSION_PASSTHROUGH";

            case HDR_CONVERSION_SYSTEM:

                return "HDR_CONVERSION_SYSTEM";

            case HDR_CONVERSION_FORCE:

                return "HDR_CONVERSION_FORCE";

            default:

                return "HDR_CONVERSION_UNKNOWN";

        }

    }

}
 
 No newline at end of file

core/java/android/provider/Settings.java

+30 −0
Original line number Diff line number Diff line
@@ -15833,6 +15833,36 @@ public final class Settings { 
        public static final String USER_PREFERRED_RESOLUTION_WIDTH =

                "user_preferred_resolution_width";













        /**













         * The HDR output mode chosen by the user. This is one of:













         * {@link android.hardware.display.HdrConversionMode#HDR_CONVERSION_PASSTHROUGH},













         * {@link android.hardware.display.HdrConversionMode#HDR_CONVERSION_SYSTEM},













         * {@link android.hardware.display.HdrConversionMode#HDR_CONVERSION_FORCE}.













         *













         * @hide













         */













        @TestApi













        @Readable













        public static final String HDR_CONVERSION_MODE = "hdr_conversion_mode";

























        /**













         * The output HDR type chosen by the user in case when {@link #HDR_CONVERSION_MODE} is













         * {@link #HDR_CONVERSION_FORCE}. This is one of:













         * {@link android.view.Display.HdrCapabilities#HDR_TYPE_INVALID},













         * {@link android.view.Display.HdrCapabilities#HDR_TYPE_DOLBY_VISION},













         * {@link android.view.Display.HdrCapabilities#HDR_TYPE_HDR10},













         * {@link android.view.Display.HdrCapabilities#HDR_TYPE_HLG},













         * {@link android.view.Display.HdrCapabilities#HDR_TYPE_HDR10_PLUS}













         * <p>













         * The value is {@link android.view.Display.HdrCapabilities#HDR_TYPE_INVALID} when user













         * chooses SDR output type. </p>













         *













         * @hide













         */













        @TestApi













        @Readable













        public static final String HDR_FORCE_CONVERSION_TYPE = "hdr_force_conversion_type";



























        /**















         * The name of the device















         */

























core/java/android/view/Display.java



+19
−0




























Original line number
Diff line number
Diff line








@@ -2497,5 +2497,24 @@ public final class Display {













                    + ", mMaxAverageLuminance=" + mMaxAverageLuminance















                    + ", mMinLuminance=" + mMinLuminance + '}';















        }



























        /**













         * @hide













         */













        @NonNull













        public static String hdrTypeToString(int hdrType) {













            switch (hdrType) {













                case HDR_TYPE_DOLBY_VISION:













                    return "HDR_TYPE_DOLBY_VISION";













                case HDR_TYPE_HDR10:













                    return "HDR_TYPE_HDR10";













                case HDR_TYPE_HLG:













                    return "HDR_TYPE_HLG";













                case HDR_TYPE_HDR10_PLUS:













                    return "HDR_TYPE_HDR10_PLUS";













                default:













                    return "HDR_TYPE_INVALID";













            }













        }















    }















}