diff options
| -rw-r--r-- | core/java/android/text/ClientFlags.java | 7 | ||||
| -rw-r--r-- | core/java/android/text/TextFlags.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 6 |
3 files changed, 1 insertions, 14 deletions
diff --git a/core/java/android/text/ClientFlags.java b/core/java/android/text/ClientFlags.java index 5d84d17bdb6e..5ff679be31b9 100644 --- a/core/java/android/text/ClientFlags.java +++ b/core/java/android/text/ClientFlags.java @@ -42,13 +42,6 @@ public class ClientFlags { } /** - * @see Flags#useBoundsForWidth() - */ - public static boolean useBoundsForWidth() { - return TextFlags.isFeatureEnabled(Flags.FLAG_USE_BOUNDS_FOR_WIDTH); - } - - /** * @see Flags#fixLineHeightForLocale() */ public static boolean fixLineHeightForLocale() { diff --git a/core/java/android/text/TextFlags.java b/core/java/android/text/TextFlags.java index 9e02460d2637..8547d7faad55 100644 --- a/core/java/android/text/TextFlags.java +++ b/core/java/android/text/TextFlags.java @@ -57,7 +57,6 @@ public final class TextFlags { public static final String[] TEXT_ACONFIGS_FLAGS = { Flags.FLAG_NO_BREAK_NO_HYPHENATION_SPAN, Flags.FLAG_PHRASE_STRICT_FALLBACK, - Flags.FLAG_USE_BOUNDS_FOR_WIDTH, Flags.FLAG_FIX_LINE_HEIGHT_FOR_LOCALE, Flags.FLAG_ICU_BIDI_MIGRATION, Flags.FLAG_FIX_MISALIGNED_CONTEXT_MENU, @@ -71,7 +70,6 @@ public final class TextFlags { public static final boolean[] TEXT_ACONFIG_DEFAULT_VALUE = { Flags.noBreakNoHyphenationSpan(), Flags.phraseStrictFallback(), - Flags.useBoundsForWidth(), Flags.fixLineHeightForLocale(), Flags.icuBidiMigration(), Flags.fixMisalignedContextMenu(), diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a4b28adae4a1..ef941da0e32d 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -1659,11 +1659,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } if (!hasUseBoundForWidthValue) { - if (CompatChanges.isChangeEnabled(USE_BOUNDS_FOR_WIDTH)) { - mUseBoundsForWidth = Flags.useBoundsForWidth(); - } else { - mUseBoundsForWidth = false; - } + mUseBoundsForWidth = CompatChanges.isChangeEnabled(USE_BOUNDS_FOR_WIDTH); } // TODO(b/179693024): Use a ChangeId instead. |