commit dc91dd6a407de90e7a129796f651bbcfdf5a944f
author Marcus Hagerott <mhagerott@google.com> Wed Dec 21 16:57:32 2016 -0800
committer Marcus Hagerott <mhagerott@google.com> Thu Dec 22 12:17:27 2016 -0800
tree 2a5e771a74c5ed0fc5c6f653aa9191e3dda3bd8f
parent a181ca6021333cbb96ff9a6abeec9e64ea19c7f9

Use AccountsLoader in settings fragment

Test: manually verify that default account and customize preferences
are hidden when there are no writable accounts

Bug 33627801

Change-Id: I423def047b6a9a29c57cf4ee73b8b259126e89b0

src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java

diff --git a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
index 0d34f68..7cc307f 100644
--- a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
@@ -54,7 +54,10 @@
 import com.android.contacts.list.ContactListFilterController;
 import com.android.contacts.logging.ScreenEvent.ScreenType;
 import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountInfo;
+import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountsLoader;
 import com.android.contacts.util.AccountFilterUtil;
 import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contactsbind.HelpUtils;
@@ -84,6 +87,7 @@
     private static final String KEY_SORT_ORDER = "sortOrder";
 
     private static final int LOADER_PROFILE = 0;
+    private static final int LOADER_ACCOUNTS = 1;
 
     /**
      * Callbacks for hosts of the {@link DisplayOptionsPreferenceFragment}.
@@ -156,6 +160,26 @@
         }
     };
 
+    private final LoaderManager.LoaderCallbacks<List<AccountInfo>> mAccountsLoaderListener =
+            new LoaderManager.LoaderCallbacks<List<AccountInfo>>() {
+                @Override
+                public Loader<List<AccountInfo>> onCreateLoader(int id, Bundle args) {
+                    return new AccountsLoader(getActivity(), AccountTypeManager.writableFilter());
+                }
+
+                @Override
+                public void onLoadFinished(
+                        Loader<List<AccountInfo>> loader, List<AccountInfo> data) {
+                    if (data.isEmpty()) {
+                        removeUnsupportedAccountPreferences();
+                    }
+                }
+
+                @Override
+                public void onLoaderReset(Loader<List<AccountInfo>> loader) {
+                }
+            };
+
     public static DisplayOptionsPreferenceFragment newInstance(String newLocalProfileExtra,
             boolean areContactsAvailable) {
         final DisplayOptionsPreferenceFragment fragment = new DisplayOptionsPreferenceFragment();
@@ -241,7 +265,8 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        getLoaderManager().restartLoader(LOADER_PROFILE, null, mProfileLoaderListener);
+        getLoaderManager().initLoader(LOADER_PROFILE, null, mProfileLoaderListener);
+        getLoaderManager().initLoader(LOADER_ACCOUNTS, null, mAccountsLoaderListener);
     }
 
     @Override
@@ -275,15 +300,6 @@
             getPreferenceScreen().removePreference(findPreference(KEY_DISPLAY_ORDER));
         }
 
-        // Remove the default account and custom view settings there aren't any writable accounts
-        final AccountTypeManager accountTypeManager = AccountTypeManager.getInstance(getContext());
-        final List<AccountWithDataSet> accounts = accountTypeManager.getAccounts(
-                /* contactWritableOnly */ true);
-        if (accounts.isEmpty()) {
-            getPreferenceScreen().removePreference(findPreference(KEY_DEFAULT_ACCOUNT));
-            getPreferenceScreen().removePreference(findPreference(KEY_CUSTOM_CONTACTS_FILTER));
-        }
-
         final boolean isPhone = TelephonyManagerCompat.isVoiceCapable(
                 (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE));
         final boolean showBlockedNumbers = isPhone && ContactsUtils.FLAG_N_FEATURE
@@ -297,6 +313,11 @@
         }
     }
 
+    private void removeUnsupportedAccountPreferences() {
+        getPreferenceScreen().removePreference(findPreference(KEY_DEFAULT_ACCOUNT));
+        getPreferenceScreen().removePreference(findPreference(KEY_CUSTOM_CONTACTS_FILTER));
+    }
+
     @Override
     public Context getContext() {
         return getActivity();