Merge "Add more unit tests cases for BiDi / RTL" (52ae3f34) · Commits · e / os / android_frameworks_base

tests/BiDiTests/AndroidManifest.xml

+21 −0

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

tests/BiDiTests/res/layout/frame_layout_ltr.xml

+18 −18

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

tests/BiDiTests/res/layout/frame_layout_rtl.xml

+19 −19

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

tests/BiDiTests/res/layout/relative_layout_ltr.xml

+69 −136

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

		<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" />

		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 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
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="left\|center_vertical"
		android:background="#FF00FF00">
		</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
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|center_horizontal"
		android:background="#FF0000FF">
		</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">
		<RelativeLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|center_horizontal"
		android:background="#FF00FFFF">
		</RelativeLayout>

		<TextView android:id="@+id/label_4"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="Type here:" />
		<RelativeLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|before"
		android:background="#FFFFFFFF">
		</RelativeLayout>

		<EditText android:id="@+id/entry_4"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_below="@id/label_4" />
		<RelativeLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|after"
		android:background="#FFFFFF00">
		</RelativeLayout>

		<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" />
		<RelativeLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|before"
		android:background="#FFFFFFFF">
		</RelativeLayout>

		<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
		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>

		</LinearLayout>
		No newline at end of file
		</FrameLayout>

tests/BiDiTests/res/layout/relative_layout_ltr_2.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