summaryrefslogtreecommitdiffstats
path: root/sample
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@google.com>2014-07-24 19:18:14 -0400
committerBehdad Esfahbod <behdad@google.com>2014-07-24 19:18:14 -0400
commitf0a1e5b2da5aaccbc1c010413365cd8c304cf5d9 (patch)
treece0073076e2c8aaf5a7170553da2df97fd62261a /sample
parent8e7a3dae37e9a22b2c054aec852615843d71caf6 (diff)
downloadandroid_frameworks_minikin-f0a1e5b2da5aaccbc1c010413365cd8c304cf5d9.tar.gz
android_frameworks_minikin-f0a1e5b2da5aaccbc1c010413365cd8c304cf5d9.tar.bz2
android_frameworks_minikin-f0a1e5b2da5aaccbc1c010413365cd8c304cf5d9.zip
Remove deprecated API
It has been unused outside minikin. Change-Id: Iaa2237767d81c77f90d0264e633375e601dd72f1
Diffstat (limited to 'sample')
-rw-r--r--sample/example.cpp4
-rw-r--r--sample/example_skia.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/sample/example.cpp b/sample/example.cpp
index b8bd66f..1247291 100644
--- a/sample/example.cpp
+++ b/sample/example.cpp
@@ -83,10 +83,10 @@ int runMinikinTest() {
FontCollection *collection = makeFontCollection();
Layout layout;
layout.setFontCollection(collection);
- layout.setProperties("font-size: 32;");
const char *text = "fine world \xe0\xa4\xa8\xe0\xa4\xae\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\xa4\xe0\xa5\x87";
+ const char *style = "font-size: 32;";
icu::UnicodeString icuText = icu::UnicodeString::fromUTF8(text);
- layout.doLayout(icuText.getBuffer(), icuText.length());
+ layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), style);
layout.dump();
Bitmap bitmap(250, 50);
layout.draw(&bitmap, 10, 40, 32);
diff --git a/sample/example_skia.cpp b/sample/example_skia.cpp
index 1a6aa23..4eb0a56 100644
--- a/sample/example_skia.cpp
+++ b/sample/example_skia.cpp
@@ -117,10 +117,10 @@ int runMinikinTest() {
FontCollection *collection = makeFontCollection();
Layout layout;
layout.setFontCollection(collection);
- layout.setProperties("font-size: 32; font-weight: 700;");
const char *text = "fine world \xe0\xa4\xa8\xe0\xa4\xae\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\xa4\xe0\xa5\x87";
+ const char *style = "font-size: 32; font-weight: 700;";
icu::UnicodeString icuText = icu::UnicodeString::fromUTF8(text);
- layout.doLayout(icuText.getBuffer(), icuText.length());
+ layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), style);
layout.dump();
SkAutoGraphics ag;