Update BiDiTest app

- change buttons text to follow their Gravity

Change-Id: Ie0d79ced9c14bf8b0f12d1c31da5e2fe6f162c88

3 files changed, 44 insertions, 42 deletions

diff --git a/tests/BiDiTests/res/layout/table_layout_ltr.xml b/tests/BiDiTests/res/layout/table_layout_ltr.xml
index 62b1819..f44de8e 100644
--- a/tests/BiDiTests/res/layout/table_layout_ltr.xml
+++ b/tests/BiDiTests/res/layout/table_layout_ltr.xml
@@ -34,13 +34,13 @@
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button2_text"
+                    android:text="@string/button_right_text"
                     android:textSize="24dip"
                     android:gravity="right"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button3_text"
+                    android:text="@string/button_after_text"
                     android:textSize="24dip"
                     android:gravity="after"
              />
@@ -49,18 +49,18 @@
         <TableRow>
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button4_text"
+                    android:text="@string/button2_text"
                     android:textSize="24dip"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button5_text"
+                    android:text="@string/button_left_text"
                     android:textSize="24dip"
                     android:gravity="left"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button6_text"
+                    android:text="@string/button_before_text"
                     android:textSize="24dip"
                     android:gravity="before"
              />
@@ -82,13 +82,13 @@
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button2_text"
+                    android:text="@string/button_right_text"
                     android:textSize="24dip"
                     android:gravity="right"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button3_text"
+                    android:text="@string/button_after_text"
                     android:textSize="24dip"
                     android:gravity="after"
              />
@@ -97,18 +97,18 @@
         <TableRow>
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button4_text"
+                    android:text="@string/button2_text"
                     android:textSize="24dip"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button5_text"
+                    android:text="@string/button_left_text"
                     android:textSize="24dip"
                     android:gravity="left"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button6_text"
+                    android:text="@string/button_before_text"
                     android:textSize="24dip"
                     android:gravity="before"
              />
@@ -130,13 +130,13 @@
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button2_text"
+                    android:text="@string/button_right_text"
                     android:textSize="24dip"
                     android:gravity="right"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button3_text"
+                    android:text="@string/button_after_text"
                     android:textSize="24dip"
                     android:gravity="after"
              />
@@ -145,18 +145,18 @@
         <TableRow>
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button4_text"
+                    android:text="@string/button2_text"
                     android:textSize="24dip"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button5_text"
+                    android:text="@string/button_left_text"
                     android:textSize="24dip"
                     android:gravity="left"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button6_text"
+                    android:text="@string/button_before_text"
                     android:textSize="24dip"
                     android:gravity="before"
              />
@@ -178,13 +178,13 @@
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button2_text"
+                    android:text="@string/button_right_text"
                     android:textSize="24dip"
                     android:gravity="right"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button3_text"
+                    android:text="@string/button_after_text"
                     android:textSize="24dip"
                     android:gravity="after"
              />
@@ -193,18 +193,18 @@
         <TableRow>
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button4_text"
+                    android:text="@string/button2_text"
                     android:textSize="24dip"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button5_text"
+                    android:text="@string/button_left_text"
                     android:textSize="24dip"
                     android:gravity="left"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button6_text"
+                    android:text="@string/button_before_text"
                     android:textSize="24dip"
                     android:gravity="before"
              />
diff --git a/tests/BiDiTests/res/layout/table_layout_rtl.xml b/tests/BiDiTests/res/layout/table_layout_rtl.xml
index 74e6286..84270ba 100644
--- a/tests/BiDiTests/res/layout/table_layout_rtl.xml
+++ b/tests/BiDiTests/res/layout/table_layout_rtl.xml
@@ -34,13 +34,13 @@
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button2_text"
+                    android:text="@string/button_right_text"
                     android:textSize="24dip"
                     android:gravity="right"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button3_text"
+                    android:text="@string/button_after_text"
                     android:textSize="24dip"
                     android:gravity="after"
              />
@@ -49,18 +49,18 @@
         <TableRow>
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button4_text"
+                    android:text="@string/button2_text"
                     android:textSize="24dip"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button5_text"
+                    android:text="@string/button_left_text"
                     android:textSize="24dip"
                     android:gravity="left"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button6_text"
+                    android:text="@string/button_before_text"
                     android:textSize="24dip"
                     android:gravity="before"
              />
@@ -82,13 +82,13 @@
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button2_text"
+                    android:text="@string/button_right_text"
                     android:textSize="24dip"
                     android:gravity="right"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button3_text"
+                    android:text="@string/button_after_text"
                     android:textSize="24dip"
                     android:gravity="after"
              />
@@ -97,18 +97,18 @@
         <TableRow>
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button4_text"
+                    android:text="@string/button2_text"
                     android:textSize="24dip"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button5_text"
+                    android:text="@string/button_left_text"
                     android:textSize="24dip"
                     android:gravity="left"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button6_text"
+                    android:text="@string/button_before_text"
                     android:textSize="24dip"
                     android:gravity="before"
              />
@@ -130,13 +130,13 @@
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button2_text"
+                    android:text="@string/button_right_text"
                     android:textSize="24dip"
                     android:gravity="right"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button3_text"
+                    android:text="@string/button_after_text"
                     android:textSize="24dip"
                     android:gravity="after"
              />
@@ -145,18 +145,18 @@
         <TableRow>
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button4_text"
+                    android:text="@string/button2_text"
                     android:textSize="24dip"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button5_text"
+                    android:text="@string/button_left_text"
                     android:textSize="24dip"
                     android:gravity="left"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button6_text"
+                    android:text="@string/button_before_text"
                     android:textSize="24dip"
                     android:gravity="before"
              />
@@ -178,13 +178,13 @@
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button2_text"
+                    android:text="@string/button_right_text"
                     android:textSize="24dip"
                     android:gravity="right"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button3_text"
+                    android:text="@string/button_after_text"
                     android:textSize="24dip"
                     android:gravity="after"
              />
@@ -193,18 +193,18 @@
         <TableRow>
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button4_text"
+                    android:text="@string/button2_text"
                     android:textSize="24dip"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button5_text"
+                    android:text="@string/button_left_text"
                     android:textSize="24dip"
                     android:gravity="left"
              />
             <Button android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:text="@string/button6_text"
+                    android:text="@string/button_before_text"
                     android:textSize="24dip"
                     android:gravity="before"
              />
diff --git a/tests/BiDiTests/res/values/strings.xml b/tests/BiDiTests/res/values/strings.xml
index 5af7a27..2aeb9e1 100644
--- a/tests/BiDiTests/res/values/strings.xml
+++ b/tests/BiDiTests/res/values/strings.xml
@@ -18,8 +18,10 @@
     <string name="button2_text">Button2</string>
     <string name="button3_text">Button3</string>
     <string name="button4_text">Button4</string>
-    <string name="button5_text">Button5</string>
-    <string name="button6_text">Button6</string>
+    <string name="button_right_text">Right</string>
+    <string name="button_after_text">After</string>
+    <string name="button_left_text">Left</string>
+    <string name="button_before_text">Before</string>
     <string name="button_requestlayout_text">Request Layout</string>
     <string name="textview_text">This is a text for a TextView</string>
     <string name="edittext_text">mmmmmmmmmmmmmmmmmmmmmmmm</string>