summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-06-02 18:29:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-02 18:29:49 -0700
commit51a1bb15ea2d669d783e1938deb7eb061f3112da (patch)
tree9caf516fe6133bf7a6c4e9b46684a0cb6f27df9a
parenta3a96d180f7b1351e6f2aaa8763dc962844fc83e (diff)
parentad4662223210827df1e62ba4c7ec24dba80a47df (diff)
downloadpackages_apps_settings-51a1bb15ea2d669d783e1938deb7eb061f3112da.zip
packages_apps_settings-51a1bb15ea2d669d783e1938deb7eb061f3112da.tar.gz
packages_apps_settings-51a1bb15ea2d669d783e1938deb7eb061f3112da.tar.bz2
am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
* commit 'ad4662223210827df1e62ba4c7ec24dba80a47df': Fix account type dialog re-creation on orientation change.
-rw-r--r--AndroidManifest.xml3
-rw-r--r--src/com/android/settings/accounts/AddAccountSettings.java1
2 files changed, 3 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2e82e3a..1b322ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1070,7 +1070,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" />
@@ -1081,6 +1081,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
--- 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 =