commit ae2459ed098d10710e0351891d880dcb4ff3a144
author Nancy Chen <nancychen@google.com> Thu Sep 03 23:41:03 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 03 23:41:03 2015 +0000
tree d3b19d0c7c78bb6356b033c3cba7dc3add42a0e4
parent c939ae39ca12069567a6b7ce37516e9e89a8b185
parent 1b9dbfbc4eb8d5102dc49f4e89402937374f8c9e

Merge "Update ViewPagerTabs to include unread count value." into ub-contactsdialer-a-dev

src/com/android/contacts/common/preference/ContactsPreferences.java

diff --git a/src/com/android/contacts/common/preference/ContactsPreferences.java b/src/com/android/contacts/common/preference/ContactsPreferences.java
index 2fce78c..befcbe4 100644
--- a/src/com/android/contacts/common/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/common/preference/ContactsPreferences.java
@@ -183,6 +183,7 @@
         // listener was unregistered.
         mDisplayOrder = -1;
         mSortOrder = -1;
+        mDefaultAccount = null;
 
         mPreferences.registerOnSharedPreferenceChangeListener(this);
     }
@@ -206,6 +207,8 @@
                     mDisplayOrder = getDisplayOrder();
                 } else if (SORT_ORDER_KEY.equals(key)) {
                     mSortOrder = getSortOrder();
+                } else if (mDefaultAccountKey.equals(key)) {
+                    mDefaultAccount = getDefaultAccount();
                 }
                 if (mListener != null) mListener.onChange();
             }

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

diff --git a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
index e49f38a..f43f3d0 100644
--- a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
@@ -17,9 +17,15 @@
 package com.android.contacts.common.preference;
 
 import android.os.Bundle;
+import android.preference.ListPreference;
 import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
 
 import com.android.contacts.common.R;
+import com.android.contacts.common.model.AccountTypeManager;
+import com.android.contacts.common.model.account.AccountWithDataSet;
+
+import java.util.List;
 
 /**
  * This fragment shows the preferences for the first header.
@@ -32,6 +38,15 @@
 
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preference_display_options);
+
+        // Remove "Default account" setting if no writable accounts.
+        final AccountTypeManager accountTypeManager = AccountTypeManager.getInstance(getContext());
+        final List<AccountWithDataSet> accounts = accountTypeManager.getAccounts(
+                /* contactWritableOnly */ true);
+        if (accounts.isEmpty()) {
+            final PreferenceScreen preferenceScreen = getPreferenceScreen();
+            preferenceScreen.removePreference((ListPreference) findPreference("accounts"));
+        }
     }
 }