commit e4e3d9c4b74a73fa5962c65ea5ca5c580ed53fd7
author Dianne Hackborn <hackbod@google.com> Mon May 16 11:09:58 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 16 11:09:58 2011 -0700
tree 19b665fdf300176505f571699283590103f2c805
parent 9b561605dd2020dd61a60a123e9445f5830d6d20
parent 27f72f5f8f8db7eaa68683b95c1a7aeeb16ce979

am 27f72f5f: DO NOT MERGE: from master -- Don\'t restart when screen size changes.

* commit '27f72f5f8f8db7eaa68683b95c1a7aeeb16ce979':
  DO NOT MERGE: from master -- Don't restart when screen size changes.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9ddc7b5..440a141 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -59,7 +59,7 @@
                   android:label="@string/application_name"
                   android:launchMode="singleTask"
                   android:alwaysRetainTaskState="true"
-                  android:configChanges="orientation|keyboardHidden|keyboard"
+                  android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
                   android:theme="@style/BrowserTheme"
                   android:hardwareAccelerated="false"
                   android:windowSoftInputMode="adjustResize" >
@@ -167,7 +167,7 @@
 
         <activity android:name="AddBookmarkPage" android:label="Save bookmark"
                   android:theme="@style/DialogWhenLarge"
-                  android:configChanges="orientation|keyboardHidden"
+                  android:configChanges="orientation|keyboardHidden|screenSize"
                   android:windowSoftInputMode="stateHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.INSERT" />