diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-12-04 21:46:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 21:46:20 +0000 |
| commit | 940a1e563fd94f912a7322cea8f0a5662b79050f (patch) | |
| tree | 3e744313ef25349af8d69d90c96dfe9e8e269d54 /tools/layoutlib/bridge/src/android/graphics | |
| parent | 028df22fd774c8a545dedb03124587b7a19e047b (diff) | |
| parent | 52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b (diff) | |
| download | frameworks_base-940a1e563fd94f912a7322cea8f0a5662b79050f.zip frameworks_base-940a1e563fd94f912a7322cea8f0a5662b79050f.tar.gz frameworks_base-940a1e563fd94f912a7322cea8f0a5662b79050f.tar.bz2 | |
am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev
* commit '52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b':
Fix AnalogClock rendering
Diffstat (limited to 'tools/layoutlib/bridge/src/android/graphics')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java index 4993262..ab79664 100644 --- a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java @@ -282,7 +282,7 @@ public class FontFamily_Delegate { @LayoutlibDelegate /*package*/ static boolean nAddFontFromAsset(long nativeFamily, AssetManager mgr, String path) { Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED, - "FontFamily.addFontFromAsset is not supported.", null, null); + "Typeface.createFromAsset is not supported.", null, null); return false; } |