diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-06-02 09:34:10 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-02 09:34:10 -0700 |
commit | 52ae3f345bff3cc4209faa441c25be0b713ff6b4 (patch) | |
tree | e5a85c3f53ca4fe0086a725e71a9dea56bae3c99 | |
parent | 8226f2b519aeacb7491272c258c5531f2f0a9a09 (diff) | |
parent | c715528c9657e5848021a27a600a0e8e5100fb34 (diff) | |
download | frameworks_base-52ae3f345bff3cc4209faa441c25be0b713ff6b4.zip frameworks_base-52ae3f345bff3cc4209faa441c25be0b713ff6b4.tar.gz frameworks_base-52ae3f345bff3cc4209faa441c25be0b713ff6b4.tar.bz2 |
Merge "Add more unit tests cases for BiDi / RTL"
11 files changed, 638 insertions, 178 deletions
diff --git a/tests/BiDiTests/AndroidManifest.xml b/tests/BiDiTests/AndroidManifest.xml index 274d8c7..148c6c9 100644 --- a/tests/BiDiTests/AndroidManifest.xml +++ b/tests/BiDiTests/AndroidManifest.xml @@ -78,6 +78,27 @@ </intent-filter> </activity> + <activity android:name=".BiDiTestRelativeLayoutRtlActivity" + android:windowSoftInputMode="stateAlwaysHidden"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + </intent-filter> + </activity> + + <activity android:name=".BiDiTestRelativeLayoutLtrActivity2" + android:windowSoftInputMode="stateAlwaysHidden"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + </intent-filter> + </activity> + + <activity android:name=".BiDiTestRelativeLayoutRtlActivity2" + android:windowSoftInputMode="stateAlwaysHidden"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + </intent-filter> + </activity> + </application> </manifest> diff --git a/tests/BiDiTests/res/layout/frame_layout_ltr.xml b/tests/BiDiTests/res/layout/frame_layout_ltr.xml index 53ae7c3..bd324e3 100644 --- a/tests/BiDiTests/res/layout/frame_layout_ltr.xml +++ b/tests/BiDiTests/res/layout/frame_layout_ltr.xml @@ -21,68 +21,68 @@ android:horizontalDirection="ltr" android:background="#FF000000"> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="right|center_vertical" android:background="#FFFF0000"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="left|center_vertical" android:background="#FF00FF00"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="top|center_horizontal" android:background="#FF0000FF"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="bottom|center_horizontal" android:background="#FF00FFFF"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="top|before" android:background="#FFFFFFFF"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="top|after" android:background="#FFFFFF00"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="bottom|before" android:background="#FFFFFFFF"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="bottom|after" android:background="#FFFFFF00"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="center_horizontal|center_vertical" android:background="#FF888888"> - </RelativeLayout> + </FrameLayout> </FrameLayout> diff --git a/tests/BiDiTests/res/layout/frame_layout_rtl.xml b/tests/BiDiTests/res/layout/frame_layout_rtl.xml index 4b87752..814f5e1 100644 --- a/tests/BiDiTests/res/layout/frame_layout_rtl.xml +++ b/tests/BiDiTests/res/layout/frame_layout_rtl.xml @@ -15,74 +15,74 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/frame_layout_rtl" + android:id="@+id/frame_layout_ltr" android:layout_width="match_parent" android:layout_height="match_parent" android:horizontalDirection="rtl" android:background="#FF000000"> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="right|center_vertical" android:background="#FFFF0000"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="left|center_vertical" android:background="#FF00FF00"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="top|center_horizontal" android:background="#FF0000FF"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="bottom|center_horizontal" android:background="#FF00FFFF"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="top|before" android:background="#FFFFFFFF"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="top|after" android:background="#FFFFFF00"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="bottom|before" android:background="#FFFFFFFF"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="bottom|after" android:background="#FFFFFF00"> - </RelativeLayout> + </FrameLayout> - <RelativeLayout + <FrameLayout android:layout_width="100dp" android:layout_height="100dp" android:layout_gravity="center_horizontal|center_vertical" android:background="#FF888888"> - </RelativeLayout> + </FrameLayout> </FrameLayout> diff --git a/tests/BiDiTests/res/layout/relative_layout_ltr.xml b/tests/BiDiTests/res/layout/relative_layout_ltr.xml index 93d1b4b..53ae7c3 100644 --- a/tests/BiDiTests/res/layout/relative_layout_ltr.xml +++ b/tests/BiDiTests/res/layout/relative_layout_ltr.xml @@ -14,142 +14,75 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/relative_layout_ltr" - android:orientation="vertical" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/frame_layout_ltr" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalDirection="ltr"> + android:horizontalDirection="ltr" + android:background="#FF000000"> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="right|center_vertical" + android:background="#FFFF0000"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="left|center_vertical" + android:background="#FF00FF00"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="top|center_horizontal" + android:background="#FF0000FF"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="bottom|center_horizontal" + android:background="#FF00FFFF"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="top|before" + android:background="#FFFFFFFF"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="top|after" + android:background="#FFFFFF00"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="bottom|before" + android:background="#FFFFFFFF"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="bottom|after" + android:background="#FFFFFF00"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="center_horizontal|center_vertical" + android:background="#FF888888"> + </RelativeLayout> + +</FrameLayout> - <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="#FF000000" - android:padding="10px"> - - <TextView android:id="@+id/label_1" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="Type here:" /> - - <EditText android:id="@+id/entry_1" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@id/label_1" /> - - <Button android:id="@+id/ok_1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/entry_1" - android:layout_alignParentRight="true" - android:layout_marginLeft="10px" - android:text="OK" /> - - <Button android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/ok_1" - android:layout_alignTop="@id/ok_1" - android:text="Cancel" /> - - </RelativeLayout> - - <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="#FF000000" - android:padding="10px" - android:horizontalDirection="ltr"> - - <TextView android:id="@+id/label_2" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="Type here:" /> - - <EditText android:id="@+id/entry_2" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@id/label_2" /> - - <Button android:id="@+id/ok_2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/entry_2" - android:layout_alignParentRight="true" - android:layout_marginLeft="10px" - android:text="OK" /> - - <Button android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/ok_2" - android:layout_alignTop="@id/ok_2" - android:text="Cancel" /> - - </RelativeLayout> - - <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="#FF000000" - android:padding="10px" - android:horizontalDirection="inherit"> - - <TextView android:id="@+id/label_3" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="Type here:" /> - - <EditText android:id="@+id/entry_3" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@id/label_3" /> - - <Button android:id="@+id/ok_3" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/entry_3" - android:layout_alignParentRight="true" - android:layout_marginLeft="10px" - android:text="OK" /> - - <Button android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/ok_3" - android:layout_alignTop="@id/ok_3" - android:text="Cancel" /> - - </RelativeLayout> - - <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="#FF000000" - android:padding="10px" - android:horizontalDirection="rtl"> - - <TextView android:id="@+id/label_4" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="Type here:" /> - - <EditText android:id="@+id/entry_4" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@id/label_4" /> - - <Button android:id="@+id/ok_4" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/entry_4" - android:layout_alignParentRight="true" - android:layout_marginLeft="10px" - android:text="OK" /> - - <Button android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/ok_4" - android:layout_alignTop="@id/ok_4" - android:text="Cancel" /> - - </RelativeLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/tests/BiDiTests/res/layout/relative_layout_ltr_2.xml b/tests/BiDiTests/res/layout/relative_layout_ltr_2.xml new file mode 100644 index 0000000..93d1b4b --- /dev/null +++ b/tests/BiDiTests/res/layout/relative_layout_ltr_2.xml @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/relative_layout_ltr" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:horizontalDirection="ltr"> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="#FF000000" + android:padding="10px"> + + <TextView android:id="@+id/label_1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Type here:" /> + + <EditText android:id="@+id/entry_1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/label_1" /> + + <Button android:id="@+id/ok_1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/entry_1" + android:layout_alignParentRight="true" + android:layout_marginLeft="10px" + android:text="OK" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/ok_1" + android:layout_alignTop="@id/ok_1" + android:text="Cancel" /> + + </RelativeLayout> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="#FF000000" + android:padding="10px" + android:horizontalDirection="ltr"> + + <TextView android:id="@+id/label_2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Type here:" /> + + <EditText android:id="@+id/entry_2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/label_2" /> + + <Button android:id="@+id/ok_2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/entry_2" + android:layout_alignParentRight="true" + android:layout_marginLeft="10px" + android:text="OK" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/ok_2" + android:layout_alignTop="@id/ok_2" + android:text="Cancel" /> + + </RelativeLayout> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="#FF000000" + android:padding="10px" + android:horizontalDirection="inherit"> + + <TextView android:id="@+id/label_3" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Type here:" /> + + <EditText android:id="@+id/entry_3" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/label_3" /> + + <Button android:id="@+id/ok_3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/entry_3" + android:layout_alignParentRight="true" + android:layout_marginLeft="10px" + android:text="OK" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/ok_3" + android:layout_alignTop="@id/ok_3" + android:text="Cancel" /> + + </RelativeLayout> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="#FF000000" + android:padding="10px" + android:horizontalDirection="rtl"> + + <TextView android:id="@+id/label_4" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Type here:" /> + + <EditText android:id="@+id/entry_4" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/label_4" /> + + <Button android:id="@+id/ok_4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/entry_4" + android:layout_alignParentRight="true" + android:layout_marginLeft="10px" + android:text="OK" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/ok_4" + android:layout_alignTop="@id/ok_4" + android:text="Cancel" /> + + </RelativeLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/tests/BiDiTests/res/layout/relative_layout_rtl.xml b/tests/BiDiTests/res/layout/relative_layout_rtl.xml new file mode 100644 index 0000000..4b87752 --- /dev/null +++ b/tests/BiDiTests/res/layout/relative_layout_rtl.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/frame_layout_rtl" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:horizontalDirection="rtl" + android:background="#FF000000"> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="right|center_vertical" + android:background="#FFFF0000"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="left|center_vertical" + android:background="#FF00FF00"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="top|center_horizontal" + android:background="#FF0000FF"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="bottom|center_horizontal" + android:background="#FF00FFFF"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="top|before" + android:background="#FFFFFFFF"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="top|after" + android:background="#FFFFFF00"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="bottom|before" + android:background="#FFFFFFFF"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="bottom|after" + android:background="#FFFFFF00"> + </RelativeLayout> + + <RelativeLayout + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_gravity="center_horizontal|center_vertical" + android:background="#FF888888"> + </RelativeLayout> + +</FrameLayout> + diff --git a/tests/BiDiTests/res/layout/relative_layout_rtl_2.xml b/tests/BiDiTests/res/layout/relative_layout_rtl_2.xml new file mode 100644 index 0000000..8418e72 --- /dev/null +++ b/tests/BiDiTests/res/layout/relative_layout_rtl_2.xml @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/relative_layout_ltr" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:horizontalDirection="rtl"> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="#FF000000" + android:padding="10px"> + + <TextView android:id="@+id/label_1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Type here:" /> + + <EditText android:id="@+id/entry_1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/label_1" /> + + <Button android:id="@+id/ok_1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/entry_1" + android:layout_alignParentRight="true" + android:layout_marginLeft="10px" + android:text="OK" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/ok_1" + android:layout_alignTop="@id/ok_1" + android:text="Cancel" /> + + </RelativeLayout> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="#FF000000" + android:padding="10px" + android:horizontalDirection="ltr"> + + <TextView android:id="@+id/label_2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Type here:" /> + + <EditText android:id="@+id/entry_2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/label_2" /> + + <Button android:id="@+id/ok_2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/entry_2" + android:layout_alignParentRight="true" + android:layout_marginLeft="10px" + android:text="OK" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/ok_2" + android:layout_alignTop="@id/ok_2" + android:text="Cancel" /> + + </RelativeLayout> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="#FF000000" + android:padding="10px" + android:horizontalDirection="inherit"> + + <TextView android:id="@+id/label_3" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Type here:" /> + + <EditText android:id="@+id/entry_3" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/label_3" /> + + <Button android:id="@+id/ok_3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/entry_3" + android:layout_alignParentRight="true" + android:layout_marginLeft="10px" + android:text="OK" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/ok_3" + android:layout_alignTop="@id/ok_3" + android:text="Cancel" /> + + </RelativeLayout> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="#FF000000" + android:padding="10px" + android:horizontalDirection="rtl"> + + <TextView android:id="@+id/label_4" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Type here:" /> + + <EditText android:id="@+id/entry_4" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/label_4" /> + + <Button android:id="@+id/ok_4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/entry_4" + android:layout_alignParentRight="true" + android:layout_marginLeft="10px" + android:text="OK" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/ok_4" + android:layout_alignTop="@id/ok_4" + android:text="Cancel" /> + + </RelativeLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java index 8b76675..1bfb9ff 100644 --- a/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java @@ -48,27 +48,42 @@ public class BiDiTestActivity extends TabActivity { tabHost.addTab(spec); intent = new Intent().setClass(this, BiDiTestLinearLayoutLtrActivity.class); - spec = tabHost.newTabSpec("linear-layout-ltr").setIndicator("LinearLayout LTR"). + spec = tabHost.newTabSpec("linear-layout-ltr").setIndicator("Linear LTR"). setContent(intent); tabHost.addTab(spec); intent = new Intent().setClass(this, BiDiTestLinearLayoutRtlActivity.class); - spec = tabHost.newTabSpec("linear-layout-rtl").setIndicator("LinearLayout RTL"). + spec = tabHost.newTabSpec("linear-layout-rtl").setIndicator("Linear RTL"). setContent(intent); tabHost.addTab(spec); intent = new Intent().setClass(this, BiDiTestFrameLayoutLtrActivity.class); - spec = tabHost.newTabSpec("frame-layout-ltr").setIndicator("FrameLayout LTR"). + spec = tabHost.newTabSpec("frame-layout-ltr").setIndicator("Frame LTR"). setContent(intent); tabHost.addTab(spec); intent = new Intent().setClass(this, BiDiTestFrameLayoutRtlActivity.class); - spec = tabHost.newTabSpec("frame-layout-rtl").setIndicator("FrameLayout RTL"). + spec = tabHost.newTabSpec("frame-layout-rtl").setIndicator("Frame RTL"). setContent(intent); tabHost.addTab(spec); intent = new Intent().setClass(this, BiDiTestRelativeLayoutLtrActivity.class); - spec = tabHost.newTabSpec("relative-layout-rtl").setIndicator("RelativeLayout LTR"). + spec = tabHost.newTabSpec("relative-layout-ltr").setIndicator("Relative LTR"). + setContent(intent); + tabHost.addTab(spec); + + intent = new Intent().setClass(this, BiDiTestRelativeLayoutRtlActivity.class); + spec = tabHost.newTabSpec("relative-layout-rtl").setIndicator("Relative RTL"). + setContent(intent); + tabHost.addTab(spec); + + intent = new Intent().setClass(this, BiDiTestRelativeLayoutLtrActivity2.class); + spec = tabHost.newTabSpec("relative-layout-ltr-2").setIndicator("Relative2 LTR"). + setContent(intent); + tabHost.addTab(spec); + + intent = new Intent().setClass(this, BiDiTestRelativeLayoutRtlActivity2.class); + spec = tabHost.newTabSpec("relative-layout-rtl-2").setIndicator("Relative2 RTL"). setContent(intent); tabHost.addTab(spec); diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutLtrActivity2.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutLtrActivity2.java new file mode 100644 index 0000000..476375c --- /dev/null +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutLtrActivity2.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.bidi; + +import android.app.Activity; +import android.os.Bundle; + +public class BiDiTestRelativeLayoutLtrActivity2 extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.relative_layout_ltr_2); + } +} + diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutRtlActivity.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutRtlActivity.java new file mode 100644 index 0000000..683b7a3 --- /dev/null +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutRtlActivity.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.bidi; + +import android.app.Activity; +import android.os.Bundle; + +public class BiDiTestRelativeLayoutRtlActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.relative_layout_rtl); + } +} + diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutRtlActivity2.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutRtlActivity2.java new file mode 100644 index 0000000..db2af7f --- /dev/null +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutRtlActivity2.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.bidi; + +import android.app.Activity; +import android.os.Bundle; + +public class BiDiTestRelativeLayoutRtlActivity2 extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.relative_layout_rtl_2); + } +} + |