From 4194e8c27ab3146624d686c74b8ac0db8ec2d1a4 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Fri, 20 Oct 2023 09:21:33 +0900 Subject: Reorganize aconfig flags This CL includes - Put all config entries into the single aconfig file. - Remove custom_locale_fallback and deprecate_fonts_xml because Gantry doesn't support converting READ_WRITE flag to READ_ONLY flag. To be a READ_ONLY flag, need to create new flag and start from scratch. Bug: N/A Test: N/A Change-Id: Iad6229b2a620674223037ccaf41ef5fcab8f7dea --- .../java/android/graphics/fonts/FontCustomizationParser.java | 2 +- graphics/java/android/graphics/fonts/FontFamily.java | 4 ++-- graphics/java/android/graphics/fonts/SystemFonts.java | 4 ++-- graphics/java/android/graphics/text/PositionedGlyphs.java | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/graphics/fonts/FontCustomizationParser.java b/graphics/java/android/graphics/fonts/FontCustomizationParser.java index 6e04a2f5e405..ba5628cd2bc1 100644 --- a/graphics/java/android/graphics/fonts/FontCustomizationParser.java +++ b/graphics/java/android/graphics/fonts/FontCustomizationParser.java @@ -182,7 +182,7 @@ public class FontCustomizationParser { // For ignoring the customization, consume the new-locale-family element but don't // register any customizations. - if (com.android.text.flags.Flags.customLocaleFallback()) { + if (com.android.text.flags.Flags.vendorCustomLocaleFallback()) { outCustomization.add(new FontConfig.Customization.LocaleFallback( Locale.forLanguageTag(lang), intOp, family)); } diff --git a/graphics/java/android/graphics/fonts/FontFamily.java b/graphics/java/android/graphics/fonts/FontFamily.java index 4c753565eb5b..685fd825d43e 100644 --- a/graphics/java/android/graphics/fonts/FontFamily.java +++ b/graphics/java/android/graphics/fonts/FontFamily.java @@ -16,7 +16,7 @@ package android.graphics.fonts; -import static com.android.text.flags.Flags.FLAG_DEPRECATE_FONTS_XML; +import static com.android.text.flags.Flags.FLAG_NEW_FONTS_FALLBACK_XML; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -145,7 +145,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) + @FlaggedApi(FLAG_NEW_FONTS_FALLBACK_XML) public @Nullable FontFamily buildVariableFamily() { int variableFamilyType = analyzeAndResolveVariableType(mFonts); if (variableFamilyType == VARIABLE_FONT_FAMILY_TYPE_UNKNOWN) { diff --git a/graphics/java/android/graphics/fonts/SystemFonts.java b/graphics/java/android/graphics/fonts/SystemFonts.java index 618aa5b5019c..3ef714ed8bdf 100644 --- a/graphics/java/android/graphics/fonts/SystemFonts.java +++ b/graphics/java/android/graphics/fonts/SystemFonts.java @@ -241,7 +241,7 @@ public final class SystemFonts { int configVersion ) { final String fontsXml; - if (com.android.text.flags.Flags.deprecateFontsXml()) { + if (com.android.text.flags.Flags.newFontsFallbackXml()) { fontsXml = FONTS_XML; } else { fontsXml = LEGACY_FONTS_XML; @@ -272,7 +272,7 @@ public final class SystemFonts { */ public static @NonNull FontConfig getSystemPreinstalledFontConfig() { final String fontsXml; - if (com.android.text.flags.Flags.deprecateFontsXml()) { + if (com.android.text.flags.Flags.newFontsFallbackXml()) { fontsXml = FONTS_XML; } else { fontsXml = LEGACY_FONTS_XML; diff --git a/graphics/java/android/graphics/text/PositionedGlyphs.java b/graphics/java/android/graphics/text/PositionedGlyphs.java index 569f9b6fe945..7932e3334063 100644 --- a/graphics/java/android/graphics/text/PositionedGlyphs.java +++ b/graphics/java/android/graphics/text/PositionedGlyphs.java @@ -16,7 +16,7 @@ package android.graphics.text; -import static com.android.text.flags.Flags.FLAG_DEPRECATE_FONTS_XML; +import static com.android.text.flags.Flags.FLAG_NEW_FONTS_FALLBACK_XML; import android.annotation.FlaggedApi; import android.annotation.IntRange; @@ -173,7 +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) + @FlaggedApi(FLAG_NEW_FONTS_FALLBACK_XML) public boolean getFakeBold(@IntRange(from = 0) int index) { Preconditions.checkArgumentInRange(index, 0, glyphCount() - 1, "index"); return nGetFakeBold(mLayoutPtr, index); @@ -185,7 +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) + @FlaggedApi(FLAG_NEW_FONTS_FALLBACK_XML) public boolean getFakeItalic(@IntRange(from = 0) int index) { Preconditions.checkArgumentInRange(index, 0, glyphCount() - 1, "index"); return nGetFakeItalic(mLayoutPtr, index); @@ -195,7 +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) + @FlaggedApi(FLAG_NEW_FONTS_FALLBACK_XML) public static final float NO_OVERRIDE = Float.MIN_VALUE; /** @@ -205,7 +205,7 @@ public final class PositionedGlyphs { * @param index the glyph index * @return overridden weight value or {@link #NO_OVERRIDE}. */ - @FlaggedApi(FLAG_DEPRECATE_FONTS_XML) + @FlaggedApi(FLAG_NEW_FONTS_FALLBACK_XML) public float getWeightOverride(@IntRange(from = 0) int index) { Preconditions.checkArgumentInRange(index, 0, glyphCount() - 1, "index"); float value = nGetWeightOverride(mLayoutPtr, index); @@ -223,7 +223,7 @@ public final class PositionedGlyphs { * @param index the glyph index * @return overridden weight value or {@link #NO_OVERRIDE}. */ - @FlaggedApi(FLAG_DEPRECATE_FONTS_XML) + @FlaggedApi(FLAG_NEW_FONTS_FALLBACK_XML) public float getItalicOverride(@IntRange(from = 0) int index) { Preconditions.checkArgumentInRange(index, 0, glyphCount() - 1, "index"); float value = nGetItalicOverride(mLayoutPtr, index); -- cgit v1.2.3-59-g8ed1b