PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2

Browse Source
This commit is contained in:
Amith Yamasani
2011-06-02 18:26:28 -07:00
committed by Android (Google) Code Review
parent 9fc039e7bc 7bb8f7288e
commit 51a9d15722
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -1069,7 +1069,7 @@
<activity android:name="com.android.settings.accounts.AddAccountSettings" <activity android:name="com.android.settings.accounts.AddAccountSettings"
android:theme="@android:style/Theme.Translucent.NoTitleBar" android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/header_add_an_account"> android:label="@string/header_add_an_account">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -1080,6 +1080,7 @@
<activity android:name="com.android.settings.accounts.ChooseAccountActivity" <activity android:name="com.android.settings.accounts.ChooseAccountActivity"
android:label="@string/header_add_an_account" android:label="@string/header_add_an_account"
android:configChanges="orientation|keyboardHidden|screenSize"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"/> android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
<activity android:name=".CryptKeeper" <activity android:name=".CryptKeeper"

1
src/com/android/settings/accounts/AddAccountSettings.java
View File

@@ -72,6 +72,7 @@ public class AddAccountSettings extends Activity {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final String[] authorities = final String[] authorities =
getIntent().getStringArrayExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY); getIntent().getStringArrayExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
final String[] accountTypes = final String[] accountTypes =