Use the persisted filter to set custom setting description (398bca96) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/common/list/ContactListFilterController.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -60,6 +60,9 @@ public abstract class ContactListFilterController {
		/** Whether the persisted filter is a custom filter. */
		public abstract boolean isCustomFilterPersisted();

		/** Returns the persisted filter. */
		public abstract ContactListFilter getPersistedFilter();

		/**
		* @param filter the filter
		* @param persistent True when the given filter should be saved soon. False when the filter
		@@ -118,11 +121,15 @@ class ContactListFilterControllerImpl extends ContactListFilterController {

		@Override
		public boolean isCustomFilterPersisted() {
		final ContactListFilter filter =
		ContactListFilter.restoreDefaultPreferences(getSharedPreferences());
		final ContactListFilter filter = getPersistedFilter();
		return filter != null && filter.filterType == ContactListFilter.FILTER_TYPE_CUSTOM;
		}

		@Override
		public ContactListFilter getPersistedFilter() {
		return ContactListFilter.restoreDefaultPreferences(getSharedPreferences());
		}

		private SharedPreferences getSharedPreferences() {
		return PreferenceManager.getDefaultSharedPreferences(mContext);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment
		final Preference customFilterPreference = findPreference(KEY_CUSTOM_CONTACTS_FILTER);
		if (customFilterPreference != null) {
		final ContactListFilter filter =
		ContactListFilterController.getInstance(getContext()).getFilter();
		ContactListFilterController.getInstance(getContext()).getPersistedFilter();
		if (filter != null) {
		if (filter.filterType == ContactListFilter.FILTER_TYPE_DEFAULT \|\|
		filter.filterType == ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS) {