diff options
| author | 2010-01-19 11:54:05 -0800 | |
|---|---|---|
| committer | 2010-01-19 11:54:05 -0800 | |
| commit | e0aed796f03b080dabae6be0803d4ead1b3260a0 (patch) | |
| tree | cab71bcfc4f4f6c0ce21d6f1f968c4538a6a73af | |
| parent | 658dc0d4b03015eb4a692968b82b664e24aa605a (diff) | |
| parent | ccec75e7a842f8ba26617406768206eb3be32222 (diff) | |
am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair
Merge commit 'ccec75e7a842f8ba26617406768206eb3be32222' into eclair-plus-aosp
* commit 'ccec75e7a842f8ba26617406768206eb3be32222':
Prevent orientation change from triggering activity recreation.
| -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 efa41131be31..03b7e2675674 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" |