Fix bug #13058470 Cannot add account -- Settings app crashes
- revert back to an Activity instead of a fragment. This
is a straight reverse of the changes introduced for trying
to have a Fragment.
Basically ChooseAccountActivity was previously an Activity for
choosing an account type. If the list of account types was containing
only one item, then the ChooseAccountActivity was just a pass thru
and was falling back to the only account authority available.
In the current reported bug, this was happening by disabling the
Email app and thus having only the GoogleAuthenticator as an
Authority.
Then in the onCreate() the ChooseAccountFragment was seeing that
there was only one account authenticator and issuing a BACK button
press. Too bad, this was done into a non finished Fragment transaction
and leading to a crash.
All in all, we NEED to have an Activity and cannot use a Fragment
in that case.
Change-Id: I4a867a25fe9580929ec50a6775105adac1f88c52
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6e01aec..fe777c9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1535,12 +1535,10 @@
</intent-filter>
</activity>
- <activity android:name="com.android.settings.Settings$ChooseAccountActivity"
+ <activity android:name="com.android.settings.accounts.ChooseAccountActivity"
android:label="@string/header_add_an_account"
- android:configChanges="orientation|keyboardHidden|screenSize">
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.accounts.ChooseAccountFragment" />
- </activity>
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
<activity android:name=".CryptKeeper"
android:immersive="true"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 6bcfbee..8bbd701 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -67,7 +67,6 @@
public static class RunningServicesActivity extends SettingsActivity { /* empty */ }
public static class ManageAccountsSettingsActivity extends SettingsActivity { /* empty */ }
public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }
- public static class ChooseAccountActivity extends SettingsActivity { /* empty */ }
public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }
public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }
public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index db44444..beb7985 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -86,7 +86,6 @@
import com.android.settings.accessibility.CaptionPropertiesFragment;
import com.android.settings.accounts.AccountSyncSettings;
import com.android.settings.accounts.AuthenticatorHelper;
-import com.android.settings.accounts.ChooseAccountFragment;
import com.android.settings.accounts.ManageAccountsSettings;
import com.android.settings.applications.ManageApplications;
import com.android.settings.applications.ProcessStatsUi;
@@ -278,7 +277,6 @@
TrustedCredentialsSettings.class.getName(),
PaymentSettings.class.getName(),
KeyboardLayoutPickerFragment.class.getName(),
- ChooseAccountFragment.class.getName(),
DashboardSummary.class.getName()
};
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 3f98e59..34b6c8d 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -143,7 +143,7 @@
getIntent().getStringArrayExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
final String[] accountTypes =
getIntent().getStringArrayExtra(AccountPreferenceBase.ACCOUNT_TYPES_FILTER_KEY);
- final Intent intent = new Intent(this, Settings.ChooseAccountActivity.class);
+ final Intent intent = new Intent(this, ChooseAccountActivity.class);
if (authorities != null) {
intent.putExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY, authorities);
}
diff --git a/src/com/android/settings/accounts/ChooseAccountFragment.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
similarity index 91%
rename from src/com/android/settings/accounts/ChooseAccountFragment.java
rename to src/com/android/settings/accounts/ChooseAccountActivity.java
index 292c3dd..631fe47 100644
--- a/src/com/android/settings/accounts/ChooseAccountFragment.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -18,7 +18,6 @@
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
-import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@@ -28,12 +27,12 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.preference.Preference;
+import android.preference.PreferenceActivity;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
import android.util.Log;
import com.android.internal.util.CharSequences;
import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
import com.google.android.collect.Maps;
import java.util.ArrayList;
@@ -45,9 +44,9 @@
/**
* Activity asking a user to select an account to be set up.
*/
-public class ChooseAccountFragment extends SettingsPreferenceFragment {
+public class ChooseAccountActivity extends PreferenceActivity {
- private static final String TAG = "ChooseAccountFragment";
+ private static final String TAG = "ChooseAccountActivity";
private String[] mAuthorities;
private PreferenceGroup mAddAccountGroup;
private final ArrayList<ProviderEntry> mProviderList = new ArrayList<ProviderEntry>();
@@ -77,13 +76,14 @@
}
@Override
- public void onCreate(Bundle icicle) {
+ protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ setContentView(R.layout.add_account_screen);
addPreferencesFromResource(R.xml.add_account_settings);
- mAuthorities = getActivity().getIntent().getStringArrayExtra(
+ mAuthorities = getIntent().getStringArrayExtra(
AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
- String[] accountTypesFilter = getActivity().getIntent().getStringArrayExtra(
+ String[] accountTypesFilter = getIntent().getStringArrayExtra(
AccountPreferenceBase.ACCOUNT_TYPES_FILTER_KEY);
if (accountTypesFilter != null) {
mAccountTypesFilter = new HashSet<String>();
@@ -100,7 +100,7 @@
* and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
*/
private void updateAuthDescriptions() {
- mAuthDescs = AccountManager.get(getActivity()).getAuthenticatorTypes();
+ mAuthDescs = AccountManager.get(this).getAuthenticatorTypes();
for (int i = 0; i < mAuthDescs.length; i++) {
mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
}
@@ -148,7 +148,7 @@
for (ProviderEntry pref : mProviderList) {
Drawable drawable = getDrawableForType(pref.type);
ProviderPreference p =
- new ProviderPreference(getActivity(), pref.type, drawable, pref.name);
+ new ProviderPreference(this, pref.type, drawable, pref.name);
mAddAccountGroup.addPreference(p);
}
} else {
@@ -160,7 +160,7 @@
}
Log.v(TAG, "No providers found for authorities: " + auths);
}
- getActivity().setResult(Activity.RESULT_CANCELED);
+ setResult(RESULT_CANCELED);
finish();
}
}
@@ -196,7 +196,7 @@
if (mTypeToAuthDescription.containsKey(accountType)) {
try {
AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
- Context authContext = getActivity().createPackageContext(desc.packageName, 0);
+ Context authContext = createPackageContext(desc.packageName, 0);
icon = authContext.getResources().getDrawable(desc.iconId);
} catch (PackageManager.NameNotFoundException e) {
// TODO: place holder icon for missing account icons?
@@ -219,7 +219,7 @@
if (mTypeToAuthDescription.containsKey(accountType)) {
try {
AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
- Context authContext = getActivity().createPackageContext(desc.packageName, 0);
+ Context authContext = createPackageContext(desc.packageName, 0);
label = authContext.getResources().getText(desc.labelId);
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "No label name for account type " + accountType);
@@ -245,7 +245,7 @@
private void finishWithAccountType(String accountType) {
Intent intent = new Intent();
intent.putExtra(AddAccountSettings.EXTRA_SELECTED_ACCOUNT, accountType);
- getActivity().setResult(Activity.RESULT_OK, intent);
+ setResult(RESULT_OK, intent);
finish();
}
}