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

Commit 96843cf6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add aconfig for text flags" into main am: 37468cec am: 55a9eda5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2723555



Change-Id: I499de93e575001d7a04adc117888d6b603c097bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2f12ec0 55a9eda5

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ java_defaults { 
    srcs: [

        ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",

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

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

    ],

}
@@ -56,3 +57,16 @@ java_aconfig_library { 
    aconfig_declarations: "com.android.window.flags.window-aconfig",

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

}



// Text

aconfig_declarations {

    name: "com.android.text.flags-aconfig",

    package: "com.android.text.flags",

    srcs: ["core/java/android/text/flags/*.aconfig"],

}



java_aconfig_library {

    name: "com.android.text.flags-aconfig-java",

    aconfig_declarations: "com.android.text.flags-aconfig",

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

}

core/java/android/text/flags/use_bounds_for_width.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.text.flags"



flag {

  name: "use_bounds_for_width"

  namespace: "text"

  description: "Feature flag for preventing horizontal clipping."

  bug: "63938206"

}