diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-07-18 13:35:18 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2011-07-18 17:47:04 -0700 |
commit | c2063a5b18bc2e54f000b411c82f43992a53854e (patch) | |
tree | c0625a4dd35c6f1319f615dfa2694421434f2e84 /tests/BiDiTests/res/layout/canvas2.xml | |
parent | 8abef6b014e58f1fdc866fc1bb1336ddcf4bbb57 (diff) | |
download | frameworks_base-c2063a5b18bc2e54f000b411c82f43992a53854e.zip frameworks_base-c2063a5b18bc2e54f000b411c82f43992a53854e.tar.gz frameworks_base-c2063a5b18bc2e54f000b411c82f43992a53854e.tar.bz2 |
Fix bug #5037425 Canvas.drawText can't handle Right-to-Left text and text composing
- optimization for single run case was broken
- pass isRTL boolean along the call stack instead of the dirFlags integer
(which was only used as a "isRTL" in the shaper)
- update unit tests
Change-Id: I33110b76a433633a0b92fbd1db03785204e0c3e6
Diffstat (limited to 'tests/BiDiTests/res/layout/canvas2.xml')
-rw-r--r-- | tests/BiDiTests/res/layout/canvas2.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/BiDiTests/res/layout/canvas2.xml b/tests/BiDiTests/res/layout/canvas2.xml index 2513c94..b3e038f 100644 --- a/tests/BiDiTests/res/layout/canvas2.xml +++ b/tests/BiDiTests/res/layout/canvas2.xml @@ -27,36 +27,39 @@ <TextView android:text="@string/ltr" + android:textSize="40dip" android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <com.android.bidi.DrawTextTestView + <com.android.bidi.BiDiTestViewDrawText local:text="@string/ltr" android:layout_width="fill_parent" - android:layout_height="40dp" /> + android:layout_height="64dp" /> <TextView android:text="@string/rtl" + android:textSize="40dip" android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content"/> - <com.android.bidi.DrawTextTestView + <com.android.bidi.BiDiTestViewDrawText local:text="@string/rtl" android:layout_width="fill_parent" - android:layout_height="40dp" /> + android:layout_height="64dp" /> <TextView android:text="@string/composing" + android:textSize="40dip" android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content"/> - <com.android.bidi.DrawTextTestView + <com.android.bidi.BiDiTestViewDrawText local:text="@string/composing" android:layout_width="fill_parent" - android:layout_height="40dp" /> + android:layout_height="64dp" /> </LinearLayout> |