diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-08-18 15:17:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-18 15:17:53 -0700 |
| commit | b7f4d117d201f21a705f576be0687610aa6fd842 (patch) | |
| tree | c9105a6de6bb6326213fb13311c1ae3123449556 /tests | |
| parent | 0bf049c63584e3e1b7e1c079b39fd6744705fbc7 (diff) | |
| parent | af3e6d64d1b388d9f746e170f7934e292f6703a7 (diff) | |
| download | frameworks_base-b7f4d117d201f21a705f576be0687610aa6fd842.zip frameworks_base-b7f4d117d201f21a705f576be0687610aa6fd842.tar.gz frameworks_base-b7f4d117d201f21a705f576be0687610aa6fd842.tar.bz2 | |
Merge "Update BiDiTest app"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/BiDiTests/res/layout/basic.xml | 14 | ||||
| -rw-r--r-- | tests/BiDiTests/res/values/strings.xml | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/tests/BiDiTests/res/layout/basic.xml b/tests/BiDiTests/res/layout/basic.xml index e8f67a6..8a27213 100644 --- a/tests/BiDiTests/res/layout/basic.xml +++ b/tests/BiDiTests/res/layout/basic.xml @@ -34,6 +34,19 @@ android:textSize="32dip" /> + <TextView android:id="@+id/textview_default" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textSize="32dip" + android:text="@string/textview_default_text" + /> + + <EditText android:id="@+id/edittext_default" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:textSize="32dip" + /> + <TextView android:id="@+id/textview_ltr" android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -46,7 +59,6 @@ android:layout_width="match_parent" android:textSize="32dip" android:textDirection="ltr" - android:text="@string/url" /> <TextView android:id="@+id/textview_rtl" diff --git a/tests/BiDiTests/res/values/strings.xml b/tests/BiDiTests/res/values/strings.xml index fde0ecf..b0809da 100644 --- a/tests/BiDiTests/res/values/strings.xml +++ b/tests/BiDiTests/res/values/strings.xml @@ -27,6 +27,7 @@ <string name="textview_text">This is a text for a TextView</string> <string name="textview_ltr_text">This is a text for a LTR TextView</string> <string name="textview_rtl_text">This is a text for a RTL TextView</string> + <string name="textview_default_text">This is a text for a default TextView</string> <string name="edittext_text">mmmmmmmmmmmmmmmmmmmmmmmm</string> <string name="normal_text">Normal String</string> <string name="normal_long_text">mmmmmmmmmmmmmmmmmmmmmmmm</string> |