Add View textAlignment

- fix bug #6163772
- use bits field and pack them as much as possible
- take care of "supportsRtl" flag from Manifest
- add visual unit tests

CTS unit tests in another CL

Change-Id: Ib77c4eb423854209af130688c5ef9977401a9c1c

5 files changed, 1229 insertions, 7 deletions

diff --git a/tests/BiDiTests/res/layout/textview_alignment_ltr.xml b/tests/BiDiTests/res/layout/textview_alignment_ltr.xml
new file mode 100644
index 0000000..0e1adba
--- /dev/null
+++ b/tests/BiDiTests/res/layout/textview_alignment_ltr.xml
@@ -0,0 +1,578 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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_alignment_ltr"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layoutDirection="ltr">
+
+        <TableLayout android:orientation="vertical"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content">
+
+            <TableRow>
+                <TextView android:text="(unspecified)"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="gravity (default)"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="gravity"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="gravity"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="gravity left"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="gravity"
+                          android:gravity="left"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="gravity"
+                          android:gravity="left"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="gravity right"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="gravity"
+                          android:gravity="right"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="gravity"
+                          android:gravity="right"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="gravity start"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="gravity"
+                          android:gravity="start"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="gravity"
+                          android:gravity="start"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="gravity end"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="gravity"
+                          android:gravity="end"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="gravity"
+                          android:gravity="end"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="gravity center"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="gravity"
+                          android:gravity="center"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="gravity"
+                          android:gravity="center"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="gravity center_horizontal"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="gravity"
+                          android:gravity="center_horizontal"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="gravity"
+                          android:gravity="center_horizontal"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="center"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="center"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="center"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="textStart"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="textStart"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="textStart"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="textEnd"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="textEnd"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="textEnd"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="viewStart"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginRight="7dip"
+                          android:layout_marginLeft="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="viewStart"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="viewStart"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow>
+                <TextView android:text="viewEnd"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginRight="7dip"
+                          android:layout_marginLeft="7dip"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="viewEnd"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="viewEnd"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                          />
+            </TableRow>
+
+            <TableRow android:textAlignment="gravity"
+                      android:gravity="center_horizontal">
+
+                <TextView android:text="inherit gravity (default)"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginRight="7dip"
+                          android:layout_marginLeft="7dip"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+            </TableRow>
+
+            <TableRow android:textAlignment="center">
+
+                <TextView android:text="inherit gravity center"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginRight="7dip"
+                          android:layout_marginLeft="7dip"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+            </TableRow>
+
+            <TableRow android:textAlignment="textStart">
+
+                <TextView android:text="inherit textStart"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginRight="7dip"
+                          android:layout_marginLeft="7dip"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+            </TableRow>
+
+            <TableRow android:textAlignment="textEnd">
+
+                <TextView android:text="inherit textEnd"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginRight="7dip"
+                          android:layout_marginLeft="7dip"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+            </TableRow>
+
+            <TableRow android:textAlignment="viewStart">
+
+                <TextView android:text="inherit viewStart"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginRight="7dip"
+                          android:layout_marginLeft="7dip"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+            </TableRow>
+
+            <TableRow android:textAlignment="viewEnd">
+
+                <TextView android:text="inherit viewEnd"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:typeface="serif"
+                          android:layout_marginRight="7dip"
+                          android:layout_marginLeft="7dip"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/textview_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+                <TextView android:layout_height="wrap_content"
+                          android:layout_width="200dip"
+                          android:textSize="24dip"
+                          android:text="@string/hebrew_text"
+                          android:textAlignment="inherit"
+                          android:layout_marginLeft="7dip"
+                          android:layout_marginRight="7dip"
+                          android:background="#444444"
+                        />
+            </TableRow>
+
+        </TableLayout>
+
+</FrameLayout>
diff --git a/tests/BiDiTests/res/layout/textview_alignment_rtl.xml b/tests/BiDiTests/res/layout/textview_alignment_rtl.xml
new file mode 100644
index 0000000..12a90d5
--- /dev/null
+++ b/tests/BiDiTests/res/layout/textview_alignment_rtl.xml
@@ -0,0 +1,578 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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_alignment_rtl"
+             android:layout_width="fill_parent"
+             android:layout_height="fill_parent"
+             android:layoutDirection="rtl">
+
+    <TableLayout android:orientation="vertical"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content">
+
+        <TableRow>
+            <TextView android:text="(unspecified)"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="gravity (default)"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="gravity"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="gravity"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="gravity left"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="gravity"
+                      android:gravity="left"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="gravity"
+                      android:gravity="left"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="gravity right"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="gravity"
+                      android:gravity="right"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="gravity"
+                      android:gravity="right"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="gravity start"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="gravity"
+                      android:gravity="start"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="gravity"
+                      android:gravity="start"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="gravity end"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="gravity"
+                      android:gravity="end"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="gravity"
+                      android:gravity="end"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="gravity center"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="gravity"
+                      android:gravity="center"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="gravity"
+                      android:gravity="center"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="gravity center_horizontal"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="gravity"
+                      android:gravity="center_horizontal"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="gravity"
+                      android:gravity="center_horizontal"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="center"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="center"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="center"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="textStart"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="textStart"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="textStart"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="textEnd"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="textEnd"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="textEnd"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="viewStart"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginRight="7dip"
+                      android:layout_marginLeft="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="viewStart"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="viewStart"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow>
+            <TextView android:text="viewEnd"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginRight="7dip"
+                      android:layout_marginLeft="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="viewEnd"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="viewEnd"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow android:textAlignment="gravity"
+                  android:gravity="center_horizontal">
+
+            <TextView android:text="inherit gravity (default)"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginRight="7dip"
+                      android:layout_marginLeft="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow android:textAlignment="center">
+
+            <TextView android:text="inherit gravity center"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginRight="7dip"
+                      android:layout_marginLeft="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow android:textAlignment="textStart">
+
+            <TextView android:text="inherit textStart"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginRight="7dip"
+                      android:layout_marginLeft="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow android:textAlignment="textEnd">
+
+            <TextView android:text="inherit textEnd"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginRight="7dip"
+                      android:layout_marginLeft="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow android:textAlignment="viewStart">
+
+            <TextView android:text="inherit viewStart"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginRight="7dip"
+                      android:layout_marginLeft="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+        <TableRow android:textAlignment="viewEnd">
+
+            <TextView android:text="inherit viewEnd"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:typeface="serif"
+                      android:layout_marginRight="7dip"
+                      android:layout_marginLeft="7dip"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/textview_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+            <TextView android:layout_height="wrap_content"
+                      android:layout_width="200dip"
+                      android:textSize="24dip"
+                      android:text="@string/hebrew_text"
+                      android:textAlignment="inherit"
+                      android:layout_marginLeft="7dip"
+                      android:layout_marginRight="7dip"
+                      android:background="#444444"
+                    />
+        </TableRow>
+
+    </TableLayout>
+
+</FrameLayout>
diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java
index c5a1235..209597e 100644
--- a/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java
+++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java
@@ -104,6 +104,16 @@ public class BiDiTestActivity extends Activity {
         addItem(result, "Canvas", BiDiTestCanvas.class, R.id.canvas);
         addItem(result, "Canvas2", BiDiTestCanvas2.class, R.id.canvas2);
 
+        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, "TextDirection LTR", BiDiTestTextViewDirectionLtr.class, R.id.textview_direction_ltr);
+        addItem(result, "TextDirection RTL", BiDiTestTextViewDirectionRtl.class, R.id.textview_direction_rtl);
+
+        addItem(result, "TextAlignment LTR", BiDiTestTextViewAlignmentLtr.class, R.id.textview_alignment_ltr);
+        addItem(result, "TextAlignment RTL", BiDiTestTextViewAlignmentRtl.class, R.id.textview_alignment_rtl);
+
         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);
@@ -134,15 +144,9 @@ public class BiDiTestActivity extends Activity {
 
         addItem(result, "Margin MIXED", BiDiTestViewGroupMarginMixed.class, R.id.view_group_margin_mixed);
 
-        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, "TextDirection LTR", BiDiTestTextViewDirectionLtr.class, R.id.textview_direction_ltr);
-        addItem(result, "TextDirection RTL", BiDiTestTextViewDirectionRtl.class, R.id.textview_direction_rtl);
-
         addItem(result, "TextView Drawables LTR", BiDiTestTextViewDrawablesLtr.class, R.id.textview_drawables_ltr);
         addItem(result, "TextView Drawables RTL", BiDiTestTextViewDrawablesRtl.class, R.id.textview_drawables_rtl);
+
         addItem(result, "Gallery LTR", BiDiTestGalleryLtr.class, R.id.gallery_ltr);
         addItem(result, "Gallery RTL", BiDiTestGalleryRtl.class, R.id.gallery_rtl);
 
diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewAlignmentLtr.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewAlignmentLtr.java
new file mode 100644
index 0000000..5ea5d81
--- /dev/null
+++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewAlignmentLtr.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 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 BiDiTestTextViewAlignmentLtr extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.textview_alignment_ltr, container, false);
+    }
+}
diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewAlignmentRtl.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewAlignmentRtl.java
new file mode 100644
index 0000000..fcc7a5d
--- /dev/null
+++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestTextViewAlignmentRtl.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 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 BiDiTestTextViewAlignmentRtl extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.textview_alignment_rtl, container, false);
+    }
+}