diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-02-13 15:01:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-13 15:01:22 -0800 |
| commit | 46e886136446ac8d0e3879b9c8dcd582c84f8d4f (patch) | |
| tree | da32996f48ffa66f0c82af7b50ad8bfcfcd18c0b /tests | |
| parent | 9d82346e812c8e23463b51453bedf6a6c53c06d7 (diff) | |
| parent | f53b451c4c60ddccb99624d5fd40733715e7a7fa (diff) | |
| download | frameworks_base-46e886136446ac8d0e3879b9c8dcd582c84f8d4f.zip frameworks_base-46e886136446ac8d0e3879b9c8dcd582c84f8d4f.tar.gz frameworks_base-46e886136446ac8d0e3879b9c8dcd582c84f8d4f.tar.bz2 | |
am f53b451c: Merge "Update BiDiTest app for GridLayout RTL tests"
* commit 'f53b451c4c60ddccb99624d5fd40733715e7a7fa':
Update BiDiTest app for GridLayout RTL tests
Diffstat (limited to 'tests')
4 files changed, 47 insertions, 5 deletions
diff --git a/tests/BiDiTests/res/layout/grid_layout_ltr.xml b/tests/BiDiTests/res/layout/grid_layout_ltr.xml index 46ea658..e320809 100644 --- a/tests/BiDiTests/res/layout/grid_layout_ltr.xml +++ b/tests/BiDiTests/res/layout/grid_layout_ltr.xml @@ -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" diff --git a/tests/BiDiTests/res/layout/grid_layout_rtl.xml b/tests/BiDiTests/res/layout/grid_layout_rtl.xml index 947e13c..6d3aae6 100644 --- a/tests/BiDiTests/res/layout/grid_layout_rtl.xml +++ b/tests/BiDiTests/res/layout/grid_layout_rtl.xml @@ -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" diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeLtr.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeLtr.java index 859b8fb..2b5e674 100644 --- a/tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeLtr.java +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeLtr.java @@ -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); diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeRtl.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeRtl.java index fac8c95..3a03c6c 100644 --- a/tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeRtl.java +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeRtl.java @@ -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); |