Merge "Revert "Update layoutlib following Change Id10ca97f on FontFamily"" (f552a6f9) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java

+8 −16

Original line number	Diff line number	Diff line
		@@ -248,17 +248,14 @@ public class FontFamily_Delegate {
		// ---- delegate methods ----
		@LayoutlibDelegate
		/package/ static boolean addFont(FontFamily thisFontFamily, String path, int ttcIndex) {
		if (thisFontFamily.mBuilderPtr == 0) {
		throw new IllegalStateException("Unable to call addFont after freezing.");
		}
		final FontFamily_Delegate delegate = getDelegate(thisFontFamily.mBuilderPtr);
		final FontFamily_Delegate delegate = getDelegate(thisFontFamily.mNativePtr);
		return delegate != null && delegate.addFont(path, ttcIndex);
		}

		// ---- native methods ----

		@LayoutlibDelegate
		/package/ static long nInitBuilder(String lang, int variant) {
		/package/ static long nCreateFamily(String lang, int variant) {
		// TODO: support lang. This is required for japanese locale.
		FontFamily_Delegate delegate = new FontFamily_Delegate();
		// variant can be 0, 1 or 2.
		@@ -272,11 +269,6 @@ public class FontFamily_Delegate {
		return sManager.addNewDelegate(delegate);
		}

		@LayoutlibDelegate
		/package/ static long nCreateFamily(long builderPtr) {
		return builderPtr;
		}

		@LayoutlibDelegate
		/package/ static void nUnrefFamily(long nativePtr) {
		// Removing the java reference for the object doesn't mean that it's freed for garbage
		@@ -285,22 +277,22 @@ public class FontFamily_Delegate {
		}

		@LayoutlibDelegate
		/package/ static boolean nAddFont(long builderPtr, ByteBuffer font, int ttcIndex) {
		/package/ static boolean nAddFont(long nativeFamily, ByteBuffer font, int ttcIndex) {
		assert false : "The only client of this method has been overriden.";
		return false;
		}

		@LayoutlibDelegate
		/package/ static boolean nAddFontWeightStyle(long builderPtr, ByteBuffer font,
		/package/ static boolean nAddFontWeightStyle(long nativeFamily, ByteBuffer font,
		int ttcIndex, List<FontListParser.Axis> listOfAxis,
		int weight, boolean isItalic) {
		assert false : "The only client of this method has been overriden.";
		return false;
		}

		static boolean addFont(long builderPtr, final String path, final int weight,
		static boolean addFont(long nativeFamily, final String path, final int weight,
		final boolean isItalic) {
		final FontFamily_Delegate delegate = getDelegate(builderPtr);
		final FontFamily_Delegate delegate = getDelegate(nativeFamily);
		if (delegate != null) {
		if (sFontLocation == null) {
		delegate.mPostInitRunnables.add(() -> delegate.addFont(path, weight, isItalic));
		@@ -312,8 +304,8 @@ public class FontFamily_Delegate {
		}

		@LayoutlibDelegate
		/package/ static boolean nAddFontFromAsset(long builderPtr, AssetManager mgr, String path) {
		FontFamily_Delegate ffd = sManager.getDelegate(builderPtr);
		/package/ static boolean nAddFontFromAsset(long nativeFamily, AssetManager mgr, String path) {
		FontFamily_Delegate ffd = sManager.getDelegate(nativeFamily);
		if (ffd == null) {
		return false;
		}

tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -212,10 +212,9 @@ public final class Typeface_Delegate {
		Map<String, ByteBuffer> bufferForPath) {
		FontFamily fontFamily = new FontFamily(family.lang, family.variant);
		for (FontListParser.Font font : family.fonts) {
		FontFamily_Delegate.addFont(fontFamily.mBuilderPtr, font.fontName, font.weight,
		FontFamily_Delegate.addFont(fontFamily.mNativePtr, font.fontName, font.weight,
		font.isItalic);
		}
		fontFamily.freeze();
		return fontFamily;
		}

tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -339,8 +339,7 @@ public final class CreateInfo implements ICreateInfo {
		*/
		private final static String[] PROMOTED_FIELDS = new String[] {
		"android.graphics.drawable.VectorDrawable#mVectorState",
		"android.view.Choreographer#mLastFrameTimeNanos",
		"android.graphics.FontFamily#mBuilderPtr"
		"android.view.Choreographer#mLastFrameTimeNanos"
		};

		/**