summaryrefslogtreecommitdiffstats
path: root/core/jni/android
diff options
context:
space:
mode:
authorJunichi Monma <monma@google.com>2013-01-17 09:08:30 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-17 09:08:30 -0800
commit7d73eb049fef6abdba3e2dd30dc4a5c10b4a6588 (patch)
tree05651ebbe33edf220a2e3a8b4f09a83186b6afaf /core/jni/android
parentf2ca51dbff919e1b24087294343a826c8460dbe5 (diff)
parent6d191ed99491f209168e88f3d570e89c6836285b (diff)
downloadframeworks_base-7d73eb049fef6abdba3e2dd30dc4a5c10b4a6588.zip
frameworks_base-7d73eb049fef6abdba3e2dd30dc4a5c10b4a6588.tar.gz
frameworks_base-7d73eb049fef6abdba3e2dd30dc4a5c10b4a6588.tar.bz2
am 6d191ed9: Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
* commit '6d191ed99491f209168e88f3d570e89c6836285b': Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
Diffstat (limited to 'core/jni/android')
-rw-r--r--core/jni/android/graphics/TextLayoutCache.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index 7257a18..7544645 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -810,6 +810,9 @@ bool TextLayoutShaper::isComplexScript(hb_script_t script) {
case HB_SCRIPT_CYRILLIC:
case HB_SCRIPT_HANGUL:
case HB_SCRIPT_INHERITED:
+ case HB_SCRIPT_HAN:
+ case HB_SCRIPT_KATAKANA:
+ case HB_SCRIPT_HIRAGANA:
return false;
default:
return true;