Fix account type dialog re-creation on orientation change.

Bug: 4499512

Dummy activity that launches ChooseAccountActivity was re-launching it on orientation
changes. Make sure that it only launches it one time.

Change-Id: I764a59eaefc3ce4546330ed1b994d88b8703ce80

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7e7bf1d..e62ef64 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1068,7 +1068,7 @@
 
         <activity android:name="com.android.settings.accounts.AddAccountSettings"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:configChanges="orientation|keyboardHidden"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/header_add_an_account">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1079,6 +1079,7 @@
 
         <activity android:name="com.android.settings.accounts.ChooseAccountActivity"
             android:label="@string/header_add_an_account"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
 
         <activity android:name=".CryptKeeper"

diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 4c5c0b8..72ef130 100644 (file)
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -72,6 +72,7 @@ public class AddAccountSettings extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         final String[] authorities =
                 getIntent().getStringArrayExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
         final String[] accountTypes =