diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-06-02 18:27:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-02 18:27:54 -0700 |
| commit | ad4662223210827df1e62ba4c7ec24dba80a47df (patch) | |
| tree | a8bb4124e3d7114fa32059c15649f3147fc7f2db | |
| parent | bb8fc4a4ea069aab35bb30b18cf3f6f72d3d1682 (diff) | |
| parent | 51a9d15722b3c94ac92e05b19048b678247b034e (diff) | |
| download | packages_apps_settings-ad4662223210827df1e62ba4c7ec24dba80a47df.zip packages_apps_settings-ad4662223210827df1e62ba4c7ec24dba80a47df.tar.gz packages_apps_settings-ad4662223210827df1e62ba4c7ec24dba80a47df.tar.bz2 | |
am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
* commit '51a9d15722b3c94ac92e05b19048b678247b034e':
Fix account type dialog re-creation on orientation change.
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | src/com/android/settings/accounts/AddAccountSettings.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 38ebfed..54c29c1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1069,7 +1069,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" /> @@ -1080,6 +1080,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 = |