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

Commit 4725fe6c authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Remove use_bounds_for_width flag 

Bug: 63938206
Bug: 364533012
Flag: EXEMPT removing com.android.text.flags.use_bounds_for_width
Test: repo grep USE_BOUNDS_FOR_WIDTH | grep -v -e import -e FlaggedApi
Change-Id: I2c30b8e330b6d896888f08794ca30ca81c8a7f01
parent 5b8b3ed4

core/java/android/text/ClientFlags.java

+0 −7
Original line number Diff line number Diff line
@@ -41,13 +41,6 @@ public class ClientFlags { 
        return TextFlags.isFeatureEnabled(Flags.FLAG_PHRASE_STRICT_FALLBACK);

    }



    /**

     * @see Flags#useBoundsForWidth()

     */

    public static boolean useBoundsForWidth() {

        return TextFlags.isFeatureEnabled(Flags.FLAG_USE_BOUNDS_FOR_WIDTH);

    }



    /**

     * @see Flags#fixLineHeightForLocale()

     */

core/java/android/text/TextFlags.java

+0 −2
Original line number Diff line number Diff line
@@ -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(),

core/java/android/widget/TextView.java

+1 −5
Original line number Diff line number Diff line
@@ -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.