commit cda6133fcbe68641919581bcc9d080063365f07a
author Seigo Nonaka <nona@google.com> Tue Aug 01 17:34:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 01 17:34:05 2017 +0000
tree ed92d98adbaa9381c29c5fc0f7a6e37855d66052
parent 881146fa9fae0fdb7dbcbdd7266e0b0efc83f617
parent f87bd04235b47150d9891605d12b2113efbadf04

Revert "Update Typeface_Delegate following Change I2744db73" DO NOT MERGE
am: f87bd04235

Change-Id: I1a6b8b0bba23c30537d9569aa903b9b004d1ece1

bridge/src/android/graphics/Typeface_Delegate.java

diff --git a/bridge/src/android/graphics/Typeface_Delegate.java b/bridge/src/android/graphics/Typeface_Delegate.java
index 6efa549..a04a324 100644
--- a/bridge/src/android/graphics/Typeface_Delegate.java
+++ b/bridge/src/android/graphics/Typeface_Delegate.java
@@ -25,9 +25,9 @@
 import android.graphics.FontFamily_Delegate.FontVariant;
 import android.graphics.fonts.FontVariationAxis;
 import android.text.FontConfig;
-import android.util.ArrayMap;
 
 import java.awt.Font;
+import java.io.File;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
@@ -262,19 +262,16 @@
     }
 
     @LayoutlibDelegate
-    /*package*/ static void buildSystemFallback(String xmlPath, String fontDir,
-            ArrayMap<String, Typeface> fontMap, ArrayMap<String, FontFamily[]> fallbackMap) {
-        Typeface.buildSystemFallback_Original(getFontLocation() + "/fonts.xml", fontDir, fontMap,
-                fallbackMap);
+    /*package*/ static File getSystemFontConfigLocation() {
+        return new File(getFontLocation());
     }
 
     @LayoutlibDelegate
-    /*package*/ static FontFamily createFontFamily(
-            String familyName, List<FontConfig.Font> fonts, String languageTag, int variant,
-            Map<String, ByteBuffer> cache, String fontDir) {
-        FontFamily fontFamily = new FontFamily(languageTag, variant);
-        for (FontConfig.Font font : fonts) {
-            String fullPathName = fontDir + font.getFontName();
+    /*package*/ static FontFamily makeFamilyFromParsed(FontConfig.Family family,
+            Map<String, ByteBuffer> bufferForPath) {
+        FontFamily fontFamily = new FontFamily(family.getLanguage(), family.getVariant());
+        for (FontConfig.Font font : family.getFonts()) {
+            String fullPathName = "/system/fonts/" + font.getFontName();
             FontFamily_Delegate.addFont(fontFamily.mBuilderPtr, fullPathName,
                     font.getWeight(), font.isItalic());
         }

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

diff --git a/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/create/src/com/android/tools/layoutlib/create/CreateInfo.java
index 5a9d37f..f595803 100644
--- a/create/src/com/android/tools/layoutlib/create/CreateInfo.java
+++ b/create/src/com/android/tools/layoutlib/create/CreateInfo.java
@@ -169,8 +169,8 @@
         "android.graphics.drawable.GradientDrawable#buildRing",
         "android.graphics.drawable.AdaptiveIconDrawable#<init>",
         "android.graphics.FontFamily#addFont",
-        "android.graphics.Typeface#buildSystemFallback",
-        "android.graphics.Typeface#createFontFamily",
+        "android.graphics.Typeface#getSystemFontConfigLocation",
+        "android.graphics.Typeface#makeFamilyFromParsed",
         "android.os.Handler#sendMessageAtTime",
         "android.os.HandlerThread#run",
         "android.preference.Preference#getView",