diff options
6 files changed, 35 insertions, 13 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 05ec9ba71a4c..22b1ef8ecd20 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -17563,7 +17563,7 @@ package android.graphics.fonts { ctor public FontFamily.Builder(@NonNull android.graphics.fonts.Font); method @NonNull public android.graphics.fonts.FontFamily.Builder addFont(@NonNull android.graphics.fonts.Font); method @NonNull public android.graphics.fonts.FontFamily build(); - method @Nullable public android.graphics.fonts.FontFamily buildVariableFamily(); + method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") @Nullable public android.graphics.fonts.FontFamily buildVariableFamily(); } public final class FontStyle { @@ -17656,7 +17656,7 @@ package android.graphics.text { method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public int getHyphenation(); method public int getLineBreakStyle(); method public int getLineBreakWordStyle(); - method @NonNull public android.graphics.text.LineBreakConfig merge(@NonNull android.graphics.text.LineBreakConfig); + method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.graphics.text.LineBreakConfig merge(@NonNull android.graphics.text.LineBreakConfig); field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int HYPHENATION_DISABLED = 0; // 0x0 field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int HYPHENATION_ENABLED = 1; // 0x1 field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int HYPHENATION_UNSPECIFIED = -1; // 0xffffffff @@ -17664,16 +17664,16 @@ package android.graphics.text { field public static final int LINE_BREAK_STYLE_NONE = 0; // 0x0 field public static final int LINE_BREAK_STYLE_NORMAL = 2; // 0x2 field public static final int LINE_BREAK_STYLE_STRICT = 3; // 0x3 - field public static final int LINE_BREAK_STYLE_UNSPECIFIED = -1; // 0xffffffff + field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int LINE_BREAK_STYLE_UNSPECIFIED = -1; // 0xffffffff field public static final int LINE_BREAK_WORD_STYLE_NONE = 0; // 0x0 field public static final int LINE_BREAK_WORD_STYLE_PHRASE = 1; // 0x1 - field public static final int LINE_BREAK_WORD_STYLE_UNSPECIFIED = -1; // 0xffffffff + field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int LINE_BREAK_WORD_STYLE_UNSPECIFIED = -1; // 0xffffffff } public static final class LineBreakConfig.Builder { ctor public LineBreakConfig.Builder(); method @NonNull public android.graphics.text.LineBreakConfig build(); - method @NonNull public android.graphics.text.LineBreakConfig.Builder merge(@NonNull android.graphics.text.LineBreakConfig); + method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.graphics.text.LineBreakConfig.Builder merge(@NonNull android.graphics.text.LineBreakConfig); method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.graphics.text.LineBreakConfig.Builder setHyphenation(int); method @NonNull public android.graphics.text.LineBreakConfig.Builder setLineBreakStyle(int); method @NonNull public android.graphics.text.LineBreakConfig.Builder setLineBreakWordStyle(int); @@ -17698,7 +17698,7 @@ package android.graphics.text { method @NonNull public android.graphics.text.LineBreaker.Builder setHyphenationFrequency(int); method @NonNull public android.graphics.text.LineBreaker.Builder setIndents(@Nullable int[]); method @NonNull public android.graphics.text.LineBreaker.Builder setJustificationMode(int); - method @NonNull public android.graphics.text.LineBreaker.Builder setUseBoundsForWidth(boolean); + method @FlaggedApi("com.android.text.flags.use_bounds_for_width") @NonNull public android.graphics.text.LineBreaker.Builder setUseBoundsForWidth(boolean); } public static class LineBreaker.ParagraphConstraints { @@ -17750,18 +17750,18 @@ package android.graphics.text { method public float getAdvance(); method public float getAscent(); method public float getDescent(); - method public boolean getFakeBold(@IntRange(from=0) int); - method public boolean getFakeItalic(@IntRange(from=0) int); + method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public boolean getFakeBold(@IntRange(from=0) int); + method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public boolean getFakeItalic(@IntRange(from=0) int); method @NonNull public android.graphics.fonts.Font getFont(@IntRange(from=0) int); method @IntRange(from=0) public int getGlyphId(@IntRange(from=0) int); method public float getGlyphX(@IntRange(from=0) int); method public float getGlyphY(@IntRange(from=0) int); - method public float getItalicOverride(@IntRange(from=0) int); + method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public float getItalicOverride(@IntRange(from=0) int); method public float getOffsetX(); method public float getOffsetY(); - method public float getWeightOverride(@IntRange(from=0) int); + method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public float getWeightOverride(@IntRange(from=0) int); method @IntRange(from=0) public int glyphCount(); - field public static final float NO_OVERRIDE = 1.4E-45f; + field @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public static final float NO_OVERRIDE = 1.4E-45f; } public class TextRunShaper { @@ -47897,8 +47897,8 @@ package android.text.style { } @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public class LineBreakConfigSpan { - ctor public LineBreakConfigSpan(@NonNull android.graphics.text.LineBreakConfig); - method @NonNull public android.graphics.text.LineBreakConfig getLineBreakConfig(); + ctor @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public LineBreakConfigSpan(@NonNull android.graphics.text.LineBreakConfig); + method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.graphics.text.LineBreakConfig getLineBreakConfig(); } @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final class LineBreakConfigSpan.NoHyphenationSpan extends android.text.style.LineBreakConfigSpan { diff --git a/core/java/android/text/style/LineBreakConfigSpan.java b/core/java/android/text/style/LineBreakConfigSpan.java index b8033a9d6fe1..25c1db4d9804 100644 --- a/core/java/android/text/style/LineBreakConfigSpan.java +++ b/core/java/android/text/style/LineBreakConfigSpan.java @@ -35,6 +35,7 @@ public class LineBreakConfigSpan { * Construct a new {@link LineBreakConfigSpan} * @param lineBreakConfig a line break config */ + @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public LineBreakConfigSpan(@NonNull LineBreakConfig lineBreakConfig) { mLineBreakConfig = lineBreakConfig; } @@ -43,6 +44,7 @@ public class LineBreakConfigSpan { * Gets an associated line break config. * @return associated line break config. */ + @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public @NonNull LineBreakConfig getLineBreakConfig() { return mLineBreakConfig; } diff --git a/graphics/java/android/graphics/fonts/FontFamily.java b/graphics/java/android/graphics/fonts/FontFamily.java index 7cca7f19da7d..5e4110590325 100644 --- a/graphics/java/android/graphics/fonts/FontFamily.java +++ b/graphics/java/android/graphics/fonts/FontFamily.java @@ -16,6 +16,9 @@ package android.graphics.fonts; +import static com.android.text.flags.Flags.FLAG_DEPRECATE_FONTS_XML; + +import android.annotation.FlaggedApi; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; @@ -138,6 +141,7 @@ public final class FontFamily { * @return A variable font family. null if a variable font cannot be built from the given * fonts. */ + @FlaggedApi(FLAG_DEPRECATE_FONTS_XML) public @Nullable FontFamily buildVariableFamily() { int variableFamilyType = analyzeAndResolveVariableType(mFonts); if (variableFamilyType == VARIABLE_FONT_FAMILY_TYPE_UNKNOWN) { diff --git a/graphics/java/android/graphics/text/LineBreakConfig.java b/graphics/java/android/graphics/text/LineBreakConfig.java index 13540e0df789..e81525fb7d60 100644 --- a/graphics/java/android/graphics/text/LineBreakConfig.java +++ b/graphics/java/android/graphics/text/LineBreakConfig.java @@ -110,6 +110,7 @@ public final class LineBreakConfig { * This value is resolved to {@link #LINE_BREAK_STYLE_NONE} if this value is used for text * layout/rendering. */ + @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public static final int LINE_BREAK_STYLE_UNSPECIFIED = -1; /** @@ -165,6 +166,7 @@ public final class LineBreakConfig { * This value is resolved to {@link #LINE_BREAK_WORD_STYLE_NONE} if this value is used for * text layout/rendering. */ + @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public static final int LINE_BREAK_WORD_STYLE_UNSPECIFIED = -1; /** @@ -236,6 +238,7 @@ public final class LineBreakConfig { * @param config an override line break config * @return This {@code Builder}. */ + @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public @NonNull Builder merge(@NonNull LineBreakConfig config) { if (config.mLineBreakStyle != LINE_BREAK_STYLE_UNSPECIFIED) { mLineBreakStyle = config.mLineBreakStyle; @@ -483,6 +486,7 @@ public final class LineBreakConfig { * @param config an overriding config. * @return newly created instance that is current style merged with passed config. */ + @FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN) public @NonNull LineBreakConfig merge(@NonNull LineBreakConfig config) { return new LineBreakConfig( config.mLineBreakStyle == LINE_BREAK_STYLE_UNSPECIFIED diff --git a/graphics/java/android/graphics/text/LineBreaker.java b/graphics/java/android/graphics/text/LineBreaker.java index 34ab8338fb6f..dc2e794a1df4 100644 --- a/graphics/java/android/graphics/text/LineBreaker.java +++ b/graphics/java/android/graphics/text/LineBreaker.java @@ -16,6 +16,9 @@ package android.graphics.text; +import static com.android.text.flags.Flags.FLAG_USE_BOUNDS_FOR_WIDTH; + +import android.annotation.FlaggedApi; import android.annotation.FloatRange; import android.annotation.IntDef; import android.annotation.IntRange; @@ -248,6 +251,7 @@ public class LineBreaker { * @see Layout#getUseBoundsForWidth() * @see StaticLayout.Builder#setUseBoundsForWidth(boolean) */ + @FlaggedApi(FLAG_USE_BOUNDS_FOR_WIDTH) public @NonNull Builder setUseBoundsForWidth(boolean useBoundsForWidth) { mUseBoundsForWidth = useBoundsForWidth; return this; diff --git a/graphics/java/android/graphics/text/PositionedGlyphs.java b/graphics/java/android/graphics/text/PositionedGlyphs.java index 49e9d0cf8372..569f9b6fe945 100644 --- a/graphics/java/android/graphics/text/PositionedGlyphs.java +++ b/graphics/java/android/graphics/text/PositionedGlyphs.java @@ -16,6 +16,9 @@ package android.graphics.text; +import static com.android.text.flags.Flags.FLAG_DEPRECATE_FONTS_XML; + +import android.annotation.FlaggedApi; import android.annotation.IntRange; import android.annotation.NonNull; import android.graphics.Paint; @@ -170,6 +173,7 @@ public final class PositionedGlyphs { * @param index the glyph index * @return true if the fake bold option is on, otherwise off. */ + @FlaggedApi(FLAG_DEPRECATE_FONTS_XML) public boolean getFakeBold(@IntRange(from = 0) int index) { Preconditions.checkArgumentInRange(index, 0, glyphCount() - 1, "index"); return nGetFakeBold(mLayoutPtr, index); @@ -181,6 +185,7 @@ public final class PositionedGlyphs { * @param index the glyph index * @return true if the fake italic option is on, otherwise off. */ + @FlaggedApi(FLAG_DEPRECATE_FONTS_XML) public boolean getFakeItalic(@IntRange(from = 0) int index) { Preconditions.checkArgumentInRange(index, 0, glyphCount() - 1, "index"); return nGetFakeItalic(mLayoutPtr, index); @@ -190,6 +195,7 @@ public final class PositionedGlyphs { * A special value returned by {@link #getWeightOverride(int)} and * {@link #getItalicOverride(int)} that indicates no font variation setting is overridden. */ + @FlaggedApi(FLAG_DEPRECATE_FONTS_XML) public static final float NO_OVERRIDE = Float.MIN_VALUE; /** @@ -199,6 +205,7 @@ public final class PositionedGlyphs { * @param index the glyph index * @return overridden weight value or {@link #NO_OVERRIDE}. */ + @FlaggedApi(FLAG_DEPRECATE_FONTS_XML) public float getWeightOverride(@IntRange(from = 0) int index) { Preconditions.checkArgumentInRange(index, 0, glyphCount() - 1, "index"); float value = nGetWeightOverride(mLayoutPtr, index); @@ -216,6 +223,7 @@ public final class PositionedGlyphs { * @param index the glyph index * @return overridden weight value or {@link #NO_OVERRIDE}. */ + @FlaggedApi(FLAG_DEPRECATE_FONTS_XML) public float getItalicOverride(@IntRange(from = 0) int index) { Preconditions.checkArgumentInRange(index, 0, glyphCount() - 1, "index"); float value = nGetItalicOverride(mLayoutPtr, index); |