Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0aed796 authored by Guang Zhu's avatar Guang Zhu Committed by Android Git Automerger
Browse files

am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair

Merge commit 'ccec75e7' into eclair-plus-aosp

* commit 'ccec75e7':
  Prevent orientation change from triggering activity recreation.
parents 658dc0d4 ccec75e7
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -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"