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

Commit 16843338 authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

Merge "[LUT API] add CIE_Y sampling key" into main

parents 90f4281a 4b7e96be

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -18962,6 +18962,7 @@ package android.hardware { 
    method @FlaggedApi("android.hardware.flags.luts_api") @NonNull public int[] getSamplingKeys();

    method @FlaggedApi("android.hardware.flags.luts_api") public int getSize();

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int ONE_DIMENSION = 1; // 0x1

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int SAMPLING_KEY_CIE_Y = 2; // 0x2

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int SAMPLING_KEY_MAX_RGB = 1; // 0x1

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int SAMPLING_KEY_RGB = 0; // 0x0

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int THREE_DIMENSION = 3; // 0x3

core/java/android/hardware/DisplayLuts.java

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ public final class DisplayLuts { 
                    return "SAMPLING_KEY_RGB";

                case LutProperties.SAMPLING_KEY_MAX_RGB:

                    return "SAMPLING_KEY_MAX_RGB";

                case LutProperties.SAMPLING_KEY_CIE_Y:

                    return "SAMPLING_KEY_CIE_Y";

                default:

                    return "";

            }

core/java/android/hardware/LutProperties.java

+6 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ public final class LutProperties { 
    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"SAMPLING_KEY_"}, value = {

        SAMPLING_KEY_RGB,

        SAMPLING_KEY_MAX_RGB

        SAMPLING_KEY_MAX_RGB,

        SAMPLING_KEY_CIE_Y

    })

    public @interface SamplingKey {

    }
@@ -57,6 +58,10 @@ public final class LutProperties { 
    @FlaggedApi(Flags.FLAG_LUTS_API)

    public static final int SAMPLING_KEY_MAX_RGB = 1;



    /** use y of CIE XYZ as the gain value of a lut */

    @FlaggedApi(Flags.FLAG_LUTS_API)

    public static final int SAMPLING_KEY_CIE_Y = 2;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(value = {