From de5a95d42c9e5f4fbcf0064ae8eaa33ab5747637 Mon Sep 17 00:00:00 2001 From: Diego Perez Date: Wed, 29 Mar 2017 12:29:58 +0100 Subject: [PATCH] Fix fonts following 455f1bfc05 Test: Fixes broken tests Change-Id: I62d001c6d0ed84fe1d1d9865b1027be0e1cad8b4 --- .../bridge/src/android/graphics/Typeface_Delegate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java index e118889b3714c..80e3bada8ca34 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java @@ -233,7 +233,8 @@ public final class Typeface_Delegate { Map bufferForPath) { FontFamily fontFamily = new FontFamily(family.getLanguage(), family.getVariant()); for (FontConfig.Font font : family.getFonts()) { - FontFamily_Delegate.addFont(fontFamily.mBuilderPtr, font.getFontName(), + String fullPathName = "/system/fonts/" + font.getFontName(); + FontFamily_Delegate.addFont(fontFamily.mBuilderPtr, fullPathName, font.getWeight(), font.isItalic()); } fontFamily.freeze();