summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2011-08-26 14:05:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-26 14:05:09 -0700
commitd32f27aec04dd91edf488f280ca609e0b55aec9e (patch)
tree767de42d61cf96032c867073d72d0e7dfb6a3b1c /tests
parent2589c93733cef18a7f7502dd5830baa0a02423a7 (diff)
parent7810b5f8cffb3c2c98fd0df579f4da5a9ac6cc73 (diff)
downloadframeworks_base-d32f27aec04dd91edf488f280ca609e0b55aec9e.zip
frameworks_base-d32f27aec04dd91edf488f280ca609e0b55aec9e.tar.gz
frameworks_base-d32f27aec04dd91edf488f280ca609e0b55aec9e.tar.bz2
Merge "Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL"
Diffstat (limited to 'tests')
-rw-r--r--tests/BiDiTests/res/layout/basic.xml11
-rw-r--r--tests/BiDiTests/res/values/strings.xml1
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/BiDiTests/res/layout/basic.xml b/tests/BiDiTests/res/layout/basic.xml
index 8a27213..f503658 100644
--- a/tests/BiDiTests/res/layout/basic.xml
+++ b/tests/BiDiTests/res/layout/basic.xml
@@ -27,11 +27,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <Button android:id="@+id/button"
+ <TextView android:id="@+id/textview_password_default"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:text="@string/button_text"
android:textSize="32dip"
+ android:text="@string/textview_password_default_text"
+ />
+
+ <EditText android:id="@+id/edittext_password_default"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:textSize="32dip"
+ android:password="true"
/>
<TextView android:id="@+id/textview_default"
diff --git a/tests/BiDiTests/res/values/strings.xml b/tests/BiDiTests/res/values/strings.xml
index b0809da..b1f5e50 100644
--- a/tests/BiDiTests/res/values/strings.xml
+++ b/tests/BiDiTests/res/values/strings.xml
@@ -28,6 +28,7 @@
<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="textview_password_default_text">This is a text for a password TextView</string>
<string name="edittext_text">mmmmmmmmmmmmmmmmmmmmmmmm</string>
<string name="normal_text">Normal String</string>
<string name="normal_long_text">mmmmmmmmmmmmmmmmmmmmmmmm</string>