Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad466222 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

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

* commit '51a9d157':
  Fix account type dialog re-creation on orientation change.
parents bb8fc4a4 51a9d157

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/accounts/AddAccountSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -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 =