diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-08-05 20:54:54 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2011-08-05 20:54:54 -0700 |
commit | f2ce877c1dde094ab599f0d3103145c9381ab260 (patch) | |
tree | e8881d6fc76b1d7e3ed95ab40442a91f7c0c9290 /tests/BiDiTests/res/layout/basic.xml | |
parent | fd0b623c33393ba3144c5375380ea076469b67f9 (diff) | |
download | frameworks_base-f2ce877c1dde094ab599f0d3103145c9381ab260.zip frameworks_base-f2ce877c1dde094ab599f0d3103145c9381ab260.tar.gz frameworks_base-f2ce877c1dde094ab599f0d3103145c9381ab260.tar.bz2 |
Fix bug #4584320 Single Line EditText not drawing correctly with spans applied (ICS)
- use correct 0 index for computing advance thru the char buffer (the buffer is created from TextUtils.getChars())
- udpate unit tests
Change-Id: Iaeb07658b79ecdf5e17395d55afb7c84965bb0fc
Diffstat (limited to 'tests/BiDiTests/res/layout/basic.xml')
-rw-r--r-- | tests/BiDiTests/res/layout/basic.xml | 56 |
1 files changed, 34 insertions, 22 deletions
diff --git a/tests/BiDiTests/res/layout/basic.xml b/tests/BiDiTests/res/layout/basic.xml index 18f193e..e8f67a6 100644 --- a/tests/BiDiTests/res/layout/basic.xml +++ b/tests/BiDiTests/res/layout/basic.xml @@ -46,6 +46,7 @@ android:layout_width="match_parent" android:textSize="32dip" android:textDirection="ltr" + android:text="@string/url" /> <TextView android:id="@+id/textview_rtl" @@ -70,34 +71,45 @@ android:text="@string/button_alert_dialog_text" android:textSize="32dip" /> - </LinearLayout> - <LinearLayout - android:layout_width="600dip" - android:layout_height="128dip" - android:layout_gravity="center_vertical" - android:orientation="horizontal" - style="@android:style/Widget.Holo.Spinner" - > + <EditText xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/edittext_url" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="text" + android:textSize="32dip" + android:scrollHorizontally="true" + android:ellipsize="end" + android:text="@string/url" + /> + <LinearLayout - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="match_parent" + android:layout_width="600dip" + android:layout_height="128dip" android:layout_gravity="center_vertical" - android:orientation="vertical" + android:orientation="horizontal" + style="@android:style/Widget.Holo.Spinner" > - <TextView - android:id="@+id/spinner_line_1" - android:layout_width="match_parent" - android:layout_height="0dip" + <LinearLayout + android:layout_width="0dip" android:layout_weight="1" - android:textSize="16dip" - android:singleLine="true" - android:ellipsize="end" - android:gravity="left|center_vertical" - android:text="@string/button_text" - /> + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:orientation="vertical" + > + <TextView + android:id="@+id/spinner_line_1" + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1" + android:textSize="16dip" + android:singleLine="true" + android:ellipsize="end" + android:gravity="left|center_vertical" + android:text="@string/button_text" + /> + </LinearLayout> </LinearLayout> + </LinearLayout> </FrameLayout> |