Merge "Address comments from API council" (18bec393) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -15334,7 +15334,7 @@ package android.graphics.fonts {
		method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]);
		}

		public class SystemFonts {
		public final class SystemFonts {
		method public static java.util.Set<android.graphics.fonts.Font> getAvailableFonts();
		}

+5 −4

Original line number	Diff line number	Diff line
		@@ -422,9 +422,10 @@ public final class Font {
		nAddAxis(builderPtr, axis.getOpenTypeTagValue(), axis.getStyleValue());
		}
		}
		final long ptr = nBuild(builderPtr, mBuffer, mWeight, italic, mTtcIndex);
		final Font font = new Font(ptr, mBuffer, mFile, mWeight, italic, mTtcIndex, mAxes,
		mLocaleList);
		final ByteBuffer readonlyBuffer = mBuffer.asReadOnlyBuffer();
		final long ptr = nBuild(builderPtr, readonlyBuffer, mWeight, italic, mTtcIndex);
		final Font font = new Font(ptr, readonlyBuffer, mFile, mWeight, italic, mTtcIndex,
		mAxes, mLocaleList);
		sFontRegistory.registerNativeAllocation(font, ptr);
		return font;
		}
		@@ -477,7 +478,7 @@ public final class Font {
		}

		/**
		* Retuns a font file buffer.
		* Returns a font file buffer.
		*
		* @return a font buffer
		*/

+2 −3

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ import java.util.Set;
		/**
		* Provides the system font configurations.
		*/
		public class SystemFonts {
		public final class SystemFonts {
		private static final String TAG = "SystemFonts";
		private static final String DEFAULT_FAMILY = "sans-serif";

		@@ -58,8 +58,7 @@ public class SystemFonts {
		/**
		* Returns all available font files in the system.
		*
		* Note: The order of this font doesn't indicates anything.
		* @return an array of system fonts
		* @return a set of system fonts
		*/
		public static @NonNull Set<Font> getAvailableFonts() {
		HashSet<Font> set = new HashSet<>();