Merge "Update BiDi unit tests" (c77941fc) · Commits · e / os / android_frameworks_base

tests/BiDiTests/res/layout/basic.xml

+18 −3

Original line number	Diff line number	Diff line
		@@ -34,17 +34,32 @@
		android:textSize="32dip"
		/>

		<TextView android:id="@+id/textview"
		<TextView android:id="@+id/textview_ltr"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textSize="32dip"
		android:text="@string/textview_text"
		android:text="@string/textview_ltr_text"
		/>

		<EditText android:id="@+id/edittext"
		<EditText android:id="@+id/edittext_ltr"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:textSize="32dip"
		android:textDirection="ltr"
		/>

		<TextView android:id="@+id/textview_rtl"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textSize="32dip"
		android:text="@string/textview_rtl_text"
		/>

		<EditText android:id="@+id/edittext_rtl"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:textSize="32dip"
		android:textDirection="rtl"
		/>

		</LinearLayout>

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@
		<string name="button_requestlayout_text">Request Layout</string>
		<string name="button_alert_dialog_text">AlertDialog</string>
		<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="edittext_text">mmmmmmmmmmmmmmmmmmmmmmmm</string>
		<string name="normal_text">Normal String</string>
		<string name="normal_long_text">mmmmmmmmmmmmmmmmmmmmmmmm</string>