diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-06-01 19:11:15 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2011-06-01 19:11:15 -0700 |
commit | c2e989021e74593ce98680bce0c28b592b1ff843 (patch) | |
tree | 5c2fec0b241f5a263a2e7dda05630b5b9cd8ab04 /tests/BiDiTests | |
parent | 287bd83f9ea257594e0d483d3851236139e5744e (diff) | |
download | frameworks_base-c2e989021e74593ce98680bce0c28b592b1ff843.zip frameworks_base-c2e989021e74593ce98680bce0c28b592b1ff843.tar.gz frameworks_base-c2e989021e74593ce98680bce0c28b592b1ff843.tar.bz2 |
Add more unit tests for RelativeLayout
- update BiDiTest test app
Change-Id: I8c0734fc8a94765d269b0040ebfa048c13e11728
Diffstat (limited to 'tests/BiDiTests')
6 files changed, 212 insertions, 0 deletions
diff --git a/tests/BiDiTests/AndroidManifest.xml b/tests/BiDiTests/AndroidManifest.xml index b3d8893..274d8c7 100644 --- a/tests/BiDiTests/AndroidManifest.xml +++ b/tests/BiDiTests/AndroidManifest.xml @@ -71,6 +71,13 @@ </intent-filter> </activity> + <activity android:name=".BiDiTestRelativeLayoutLtrActivity" + 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 c27b260..53ae7c3 100644 --- a/tests/BiDiTests/res/layout/frame_layout_ltr.xml +++ b/tests/BiDiTests/res/layout/frame_layout_ltr.xml @@ -77,5 +77,12 @@ 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/frame_layout_rtl.xml b/tests/BiDiTests/res/layout/frame_layout_rtl.xml index 33ca40a..4b87752 100644 --- a/tests/BiDiTests/res/layout/frame_layout_rtl.xml +++ b/tests/BiDiTests/res/layout/frame_layout_rtl.xml @@ -77,5 +77,12 @@ 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_ltr.xml b/tests/BiDiTests/res/layout/relative_layout_ltr.xml new file mode 100644 index 0000000..93d1b4b --- /dev/null +++ b/tests/BiDiTests/res/layout/relative_layout_ltr.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/src/com/android/bidi/BiDiTestActivity.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java index d89b8fd..8b76675 100644 --- a/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java @@ -67,6 +67,11 @@ public class BiDiTestActivity extends TabActivity { setContent(intent); tabHost.addTab(spec); + intent = new Intent().setClass(this, BiDiTestRelativeLayoutLtrActivity.class); + spec = tabHost.newTabSpec("relative-layout-rtl").setIndicator("RelativeLayout LTR"). + setContent(intent); + tabHost.addTab(spec); + tabHost.setCurrentTab(0); } }
\ No newline at end of file diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutLtrActivity.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutLtrActivity.java new file mode 100644 index 0000000..d6b8d02 --- /dev/null +++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestRelativeLayoutLtrActivity.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 BiDiTestRelativeLayoutLtrActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.relative_layout_ltr); + } +} + |