diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-12-04 21:56:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 21:56:12 +0000 |
| commit | 1f4bafef128830907b929ecb4f4685b483bf828e (patch) | |
| tree | 9f826589a9ceb5df6e88cf8259d3e1ddfe379829 /tools/layoutlib/bridge/src/android/graphics | |
| parent | 6c8175fcc47f756274da39a06e23a3126fa8acef (diff) | |
| parent | 940a1e563fd94f912a7322cea8f0a5662b79050f (diff) | |
| download | frameworks_base-1f4bafef128830907b929ecb4f4685b483bf828e.zip frameworks_base-1f4bafef128830907b929ecb4f4685b483bf828e.tar.gz frameworks_base-1f4bafef128830907b929ecb4f4685b483bf828e.tar.bz2 | |
am 940a1e56: am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev
* commit '940a1e563fd94f912a7322cea8f0a5662b79050f':
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; } |