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

Fix bug #3366401 (Accounts in "Add accounts" list should be sorted alphabetically)

Browse Source 
- sort the account type list

Change-Id: Ibf1712dc75fabf144382648acc57d6f19fe0ac96
This commit is contained in:
Fabrice Di Meglio
2011-01-18 18:30:14 -08:00
parent 81f794dfa1
commit ab58d933a7
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/accounts/ChooseAccountActivity.java
View File

@@ -16,9 +16,6 @@
package com.android.settings.accounts;
import com.android.settings.R;
import com.google.android.collect.Maps;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
import android.content.ContentResolver;
@@ -33,8 +30,12 @@ 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.google.android.collect.Maps;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -54,13 +55,23 @@ public class ChooseAccountActivity extends PreferenceActivity {
private Map<String, AuthenticatorDescription> mTypeToAuthDescription
= new HashMap<String, AuthenticatorDescription>();
private static class ProviderEntry {
private static class ProviderEntry implements Comparable<ProviderEntry> {
private final CharSequence name;
private final String type;
ProviderEntry(CharSequence providerName, String accountType) {
name = providerName;
type = accountType;
}
public int compareTo(ProviderEntry another) {
if (name == null) {
return -1;
}
if (another.name == null) {
return +1;
}
return CharSequences.compareToIgnoreCase(name, another.name);
}
}
@Override
@@ -131,6 +142,7 @@ public class ChooseAccountActivity extends PreferenceActivity {
// If there's only one provider that matches, just run it.
finishWithAccountType(mProviderList.get(0).type);
} else if (mProviderList.size() > 0) {
Collections.sort(mProviderList);
mAddAccountGroup.removeAll();
for (ProviderEntry pref : mProviderList) {
Drawable drawable = getDrawableForType(pref.type);