commit e0aed796f03b080dabae6be0803d4ead1b3260a0
author Guang Zhu <guangzhu@google.com> Tue Jan 19 11:54:05 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 19 11:54:05 2010 -0800
tree cab71bcfc4f4f6c0ce21d6f1f968c4538a6a73af
parent 658dc0d4b03015eb4a692968b82b664e24aa605a
parent ccec75e7a842f8ba26617406768206eb3be32222

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.

tests/DumpRenderTree/AndroidManifest.xml

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"