Merge "Add more unit tests for RelativeLayout" (8226f2b5) · Commits · e / os / android_frameworks_base

tests/BiDiTests/AndroidManifest.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -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>

tests/BiDiTests/res/layout/frame_layout_ltr.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -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>

tests/BiDiTests/res/layout/frame_layout_rtl.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -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>

tests/BiDiTests/res/layout/relative_layout_ltr.xml

0 → 100644

+155 −0

Original line number	Diff line number	Diff line
		<?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

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -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