diff options
| author | Guang Zhu <guangzhu@google.com> | 2010-01-22 09:44:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-22 09:44:34 -0800 |
| commit | 6d001c0f7a7659d456012c220aed14a891a20a83 (patch) | |
| tree | 04d4a370e3825014661c8a098b7e0bf4c95f8799 /tests | |
| parent | bd6f964da1fc764d0681e7ce528ea6b1808623d2 (diff) | |
| parent | e0aed796f03b080dabae6be0803d4ead1b3260a0 (diff) | |
| download | frameworks_base-6d001c0f7a7659d456012c220aed14a891a20a83.zip frameworks_base-6d001c0f7a7659d456012c220aed14a891a20a83.tar.gz frameworks_base-6d001c0f7a7659d456012c220aed14a891a20a83.tar.bz2 | |
am e0aed796: am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair
Merge commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0'
* commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0':
Prevent orientation change from triggering activity recreation.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DumpRenderTree/AndroidManifest.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/DumpRenderTree/AndroidManifest.xml b/tests/DumpRenderTree/AndroidManifest.xml index efa4113..03b7e26 100644 --- a/tests/DumpRenderTree/AndroidManifest.xml +++ b/tests/DumpRenderTree/AndroidManifest.xml @@ -17,14 +17,16 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.dumprendertree"> <application android:name="HTMLHostApp"> <uses-library android:name="android.test.runner" /> - <activity android:name="Menu" android:label="1 Dump Render Tree"> + <activity android:name="Menu" android:label="Dump Render Tree" + android:screenOrientation="portrait"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.TEST" /> </intent-filter> </activity> - <activity android:name="TestShellActivity" android:launchMode="singleTop" /> - <activity android:name="ReliabilityTestActivity" /> + <activity android:name="TestShellActivity" android:launchMode="singleTop" + android:screenOrientation="portrait"/> + <activity android:name="ReliabilityTestActivity" android:screenOrientation="portrait"/> </application> <instrumentation android:name=".LayoutTestsAutoRunner" |