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

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

Merge "Update BiDiTest app for GridLayout RTL tests"

parents 42a3e79d 0d2bda31

tests/BiDiTests/res/layout/grid_layout_ltr.xml

+21 −0
Original line number Diff line number Diff line
@@ -57,6 +57,27 @@ 
        <EditText

                android:ems="8"/>



        <TextView

                android:text="You can configure email in just a few steps:"

                android:textSize="16dip"

                android:layout_columnSpan="4"

                android:layout_gravity="start"/>



        <TextView

                android:text="Email address:"

                android:layout_gravity="end"/>



        <EditText

                android:ems="10"/>



        <TextView

                android:text="Password:"

                android:layout_column="0"

                android:layout_gravity="end"/>



        <EditText

                android:ems="8"/>



        <Space

                android:layout_row="4"

                android:layout_column="0"

tests/BiDiTests/res/layout/grid_layout_rtl.xml

+21 −0
Original line number Diff line number Diff line
@@ -57,6 +57,27 @@ 
        <EditText

                android:ems="8"/>



        <TextView

                android:text="You can configure email in just a few steps:"

                android:textSize="16dip"

                android:layout_columnSpan="4"

                android:layout_gravity="end"/>



        <TextView

                android:text="Email address:"

                android:layout_gravity="start"/>



        <EditText

                android:ems="10"/>



        <TextView

                android:text="Password:"

                android:layout_column="0"

                android:layout_gravity="start"/>



        <EditText

                android:ems="8"/>



        <Space

                android:layout_row="4"

                android:layout_column="0"

tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeLtr.java

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.view.ViewGroup;

import android.widget.GridLayout;



import android.widget.*;



import static android.text.InputType.*;
@@ -62,8 +61,8 @@ public class BiDiTestGridLayoutCodeLtr extends Fragment { 
        Spec row7 = spec(6);



        Spec col1a = spec(0, 4, CENTER);

        Spec col1b = spec(0, 4, START);

        Spec col1c = spec(0, END);

        Spec col1b = spec(0, 4, LEFT);

        Spec col1c = spec(0, RIGHT);

        Spec col2 = spec(1, START);

        Spec col3 = spec(2, FILL);

        Spec col4a = spec(3);

tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeRtl.java

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.Bundle; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.GridLayout;

import android.widget.*;



import static android.text.InputType.*;
@@ -60,8 +61,8 @@ public class BiDiTestGridLayoutCodeRtl extends Fragment { 
        Spec row7 = spec(6);



        Spec col1a = spec(0, 4, CENTER);

        Spec col1b = spec(0, 4, START);

        Spec col1c = spec(0, END);

        Spec col1b = spec(0, 4, LEFT);

        Spec col1c = spec(0, RIGHT);

        Spec col2 = spec(1, START);

        Spec col3 = spec(2, FILL);

        Spec col4a = spec(3);