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

Commit 30913c44 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Add some flags" into main

parents 182aeaa1 37b52d42

AconfigFlags.bp

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ aconfig_srcjars = [ 
    ":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",

    ":sdk_sandbox_flags_lib{.generated_srcjars}",

    ":android.permission.flags-aconfig-java{.generated_srcjars}",

    ":hwui_flags_java_lib{.generated_srcjars}",

]



filegroup {
@@ -269,3 +270,10 @@ java_aconfig_library { 
    aconfig_declarations: "android.permission.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Graphics

java_aconfig_library {

    name: "hwui_flags_java_lib",

    aconfig_declarations: "hwui_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

libs/hwui/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ aconfig_declarations { 
    ],

}



java_aconfig_library {

    name: "hwui_flags_java_lib",

    aconfig_declarations: "hwui_flags",

}



cc_aconfig_library {

    name: "hwui_flags_cc_lib",

    aconfig_declarations: "hwui_flags",

libs/hwui/aconfig/hwui_flags.aconfig

+15 −1
Original line number Diff line number Diff line
@@ -6,3 +6,17 @@ flag { 
  description: "API to enable apps to restrict the amount of HDR headroom that is used"

  bug: "234181960"

}



flag {

  name: "hdr_10bit_plus"

  namespace: "core_graphics"

  description: "Use 10101010 and FP16 formats for HDR-UI when available"

  bug: "284159488"

}



flag {

  name: "gainmap_animations"

  namespace: "core_graphics"

  description: "APIs to help enable animations involving gainmaps"

  bug: "296482289"

}