Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update BiDiTest app for GridLayout RTL tests"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-02-13 14:58:53 -08:00
committed by Android (Google) Code Review
parent 42a3e79d5a 0d2bda319d
commit f53b451c4c
4 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/BiDiTests/res/layout/grid_layout_ltr.xml
View File

@@ -57,6 +57,27 @@
<EditText <EditText
android:ems="8"/> 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 <Space
android:layout_row="4" android:layout_row="4"
android:layout_column="0" android:layout_column="0"

21
tests/BiDiTests/res/layout/grid_layout_rtl.xml
View File

@@ -57,6 +57,27 @@
<EditText <EditText
android:ems="8"/> 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 <Space
android:layout_row="4" android:layout_row="4"
android:layout_column="0" android:layout_column="0"

5
tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeLtr.java
View File

@@ -23,7 +23,6 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.GridLayout; import android.widget.GridLayout;
import android.widget.*; import android.widget.*;
import static android.text.InputType.*; import static android.text.InputType.*;
@@ -62,8 +61,8 @@ public class BiDiTestGridLayoutCodeLtr extends Fragment {
Spec row7 = spec(6); Spec row7 = spec(6);
Spec col1a = spec(0, 4, CENTER); Spec col1a = spec(0, 4, CENTER);
Spec col1b = spec(0, 4, START); Spec col1b = spec(0, 4, LEFT);
Spec col1c = spec(0, END); Spec col1c = spec(0, RIGHT);
Spec col2 = spec(1, START); Spec col2 = spec(1, START);
Spec col3 = spec(2, FILL); Spec col3 = spec(2, FILL);
Spec col4a = spec(3); Spec col4a = spec(3);

5
tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeRtl.java
View File

@@ -22,6 +22,7 @@ import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.GridLayout;
import android.widget.*; import android.widget.*;
import static android.text.InputType.*; import static android.text.InputType.*;
@@ -60,8 +61,8 @@ public class BiDiTestGridLayoutCodeRtl extends Fragment {
Spec row7 = spec(6); Spec row7 = spec(6);
Spec col1a = spec(0, 4, CENTER); Spec col1a = spec(0, 4, CENTER);
Spec col1b = spec(0, 4, START); Spec col1b = spec(0, 4, LEFT);
Spec col1c = spec(0, END); Spec col1c = spec(0, RIGHT);
Spec col2 = spec(1, START); Spec col2 = spec(1, START);
Spec col3 = spec(2, FILL); Spec col3 = spec(2, FILL);
Spec col4a = spec(3); Spec col4a = spec(3);