add TextView page to BiDiTests

Change-Id: If6ba2d7f96283041d254d6d53bb268d88fed2c74

10 files changed, 932 insertions, 2 deletions

diff --git a/tests/BiDiTests/res/drawable/end.png b/tests/BiDiTests/res/drawable/end.png
new file mode 100644
index 0000000..0c110be
--- /dev/null
+++ b/tests/BiDiTests/res/drawable/end.png
diff --git a/tests/BiDiTests/res/drawable/start.png b/tests/BiDiTests/res/drawable/start.png
new file mode 100644
index 0000000..783bf90
--- /dev/null
+++ b/tests/BiDiTests/res/drawable/start.png
diff --git a/tests/BiDiTests/res/layout/textview_locale.xml b/tests/BiDiTests/res/layout/textview_locale.xml
new file mode 100644
index 0000000..a2dcbf9
--- /dev/null
+++ b/tests/BiDiTests/res/layout/textview_locale.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/textview_locale"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layoutDirection="locale">
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent">
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="start"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="start"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="start"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="end"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="end"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="end"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="left"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="left"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="left"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="right"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="right"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="right"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="center"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="center"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="center"
+                />
+
+    </LinearLayout>
+
+
+</FrameLayout>
diff --git a/tests/BiDiTests/res/layout/textview_ltr.xml b/tests/BiDiTests/res/layout/textview_ltr.xml
new file mode 100644
index 0000000..6e6b976
--- /dev/null
+++ b/tests/BiDiTests/res/layout/textview_ltr.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/textview_ltr"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layoutDirection="ltr">
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent">
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="start"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="start"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="start"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="end"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="end"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="end"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="left"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="left"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="left"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="right"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="right"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="right"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="center"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="center"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="center"
+                />
+
+    </LinearLayout>
+
+
+</FrameLayout>
diff --git a/tests/BiDiTests/res/layout/textview_rtl.xml b/tests/BiDiTests/res/layout/textview_rtl.xml
new file mode 100644
index 0000000..117227d
--- /dev/null
+++ b/tests/BiDiTests/res/layout/textview_rtl.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/textview_rtl"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layoutDirection="rtl">
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent">
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="start"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="start"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="start"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="end"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="end"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="end"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="left"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="left"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="left"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="right"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="right"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="right"
+                />
+
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_hebrew_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="center"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_latin_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="center"
+                />
+        <TextView android:id="@+id/textview"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:textSize="24dip"
+                  android:text="@string/textview_multiline_text"
+                  android:minWidth="200dip"
+                  android:drawableLeft="@drawable/start"
+                  android:drawableRight="@drawable/end"
+                  android:paddingLeft="5dip"
+                  android:paddingRight="15dip"
+                  android:drawablePadding="3dip"
+                  android:background="#884"
+                  android:layout_marginLeft="5dip"
+                  android:layout_marginRight="15dip"
+                  android:gravity="center"
+                />
+
+    </LinearLayout>
+
+
+</FrameLayout>
diff --git a/tests/BiDiTests/res/values/strings.xml b/tests/BiDiTests/res/values/strings.xml
index 16dc263..c0bbe94 100644
--- a/tests/BiDiTests/res/values/strings.xml
+++ b/tests/BiDiTests/res/values/strings.xml
@@ -38,4 +38,8 @@
     <string name="hebrew_text">&#x05DD;&#x05DE;</string>
     <string name="menu_add">Add</string>
     <string name="menu_delete">Delete</string>
-</resources>
\ No newline at end of file
+    <string name="textview_hebrew_text">&#x05DD;&#x05DE;ab?!</string>
+    <string name="textview_latin_text">ab&#x05DD;&#x05DE;?!</string>
+    <string name="textview_multiline_text">&#x05DD;&#x05DE;?!\nab?!</string>
+</resources>
+
diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java
index bee1881..c2683c2 100644
--- a/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java
+++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java
@@ -100,8 +100,9 @@ public class BiDiTestActivity extends Activity {
         List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
 
         addItem(result, "Basic", BiDiTestBasic.class, R.id.basic);
+
         addItem(result, "Canvas", BiDiTestCanvas.class, R.id.canvas);
-        
+
         addItem(result, "Linear LTR", BiDiTestLinearLayoutLtr.class, R.id.linear_layout_ltr);
         addItem(result, "Linear RTL", BiDiTestLinearLayoutRtl.class, R.id.linear_layout_rtl);
         addItem(result, "Linear LOC", BiDiTestLinearLayoutLocale.class, R.id.linear_layout_locale);
@@ -121,6 +122,10 @@ public class BiDiTestActivity extends Activity {
         addItem(result, "Table RTL", BiDiTestTableLayoutRtl.class, R.id.table_layout_rtl);
         addItem(result, "Table LOC", BiDiTestTableLayoutLocale.class, R.id.table_layout_locale);
 
+        addItem(result, "TextView LTR", BiDiTestTextViewLtr.class, R.id.textview_ltr);
+        addItem(result, "TextView RTL", BiDiTestTextViewRtl.class, R.id.textview_rtl);
+        addItem(result, "TextView LOC", BiDiTestTextViewLocale.class, R.id.textview_locale);
+
         addItem(result, "ViewPadding", BiDiTestViewPadding.class, R.id.view_padding);
         addItem(result, "ViewPadding MIXED", BiDiTestViewPaddingMixed.class, R.id.view_padding_mixed);
 
diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewLocale.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewLocale.java
new file mode 100644
index 0000000..6c64755
--- /dev/null
+++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewLocale.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.bidi;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class BiDiTestTextViewLocale extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.textview_locale, container, false);
+    }
+}
diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewLtr.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewLtr.java
new file mode 100644
index 0000000..b168411
--- /dev/null
+++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewLtr.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.bidi;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class BiDiTestTextViewLtr extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.textview_ltr, container, false);
+    }
+}
diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewRtl.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewRtl.java
new file mode 100644
index 0000000..6f36ce6
--- /dev/null
+++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewRtl.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.bidi;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class BiDiTestTextViewRtl extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.textview_rtl, container, false);
+    }
+}