Merge "Refactor BiDiTest unit tests app" (d2e743d3) · Commits · e / os / android_frameworks_base

tests/BiDiTests/AndroidManifest.xml

+0 −112

Original line number	Diff line number	Diff line
		@@ -29,118 +29,6 @@
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestBasicActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestCanvasActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestLinearLayoutLtrActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestLinearLayoutRtlActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestLinearLayoutLocaleActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestFrameLayoutLtrActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestFrameLayoutRtlActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestFrameLayoutLocaleActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestRelativeLayoutLtrActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</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>

		<activity android:name=".BiDiTestRelativeLayoutLocaleActivity2"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestTableLayoutLtrActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestTableLayoutRtlActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name=".BiDiTestTableLayoutLocaleActivity"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		</application>

		</manifest>

tests/BiDiTests/res/layout/basic.xml

+33 −28

Original line number	Diff line number	Diff line
		@@ -14,13 +14,16 @@
		limitations under the License.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/basic"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent">

		<LinearLayout android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		<LinearLayout android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		@@ -47,3 +50,5 @@
		</LinearLayout>

		</LinearLayout>

		</FrameLayout>
		No newline at end of file

tests/BiDiTests/res/layout/canvas.xml

+21 −15

Original line number	Diff line number	Diff line
		@@ -14,8 +14,12 @@
		limitations under the License.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/canvas"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent">

		<LinearLayout android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		@@ -32,3 +36,5 @@
		/>

		</LinearLayout>

		</FrameLayout>
		No newline at end of file

tests/BiDiTests/res/layout/custom_list_item.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2006 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.
		-->

		<TextView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@android:id/text1"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:gravity="center_vertical"
		android:paddingLeft="6dip"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:background="?android:attr/activatedBackgroundIndicator"
		/>

tests/BiDiTests/res/layout/frame_layout_locale.xml

+64 −60

Original line number	Diff line number	Diff line
		@@ -15,8 +15,11 @@
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/frame_layout_ltr"
		android:layout_width="match_parent"
		android:id="@+id/frame_layout_locale"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent">

		<FrameLayout android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layoutDirection="locale"
		android:background="#FF000000">
		@@ -86,3 +89,4 @@

		</FrameLayout>

		</FrameLayout>