Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09b867ec authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Update BiDiTest app"

parents 0e5e16a6 2f9cad27

tests/BiDiTests/res/layout/table_layout_ltr.xml

+20 −20
Original line number Diff line number Diff line
@@ -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"

             />

tests/BiDiTests/res/layout/table_layout_rtl.xml

+20 −20
Original line number Diff line number Diff line
@@ -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"

             />

tests/BiDiTests/res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -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>