Contacts to display preference UI tweaks (2/2)
* Make ContactListFilter.isContactsFilterType non-static
and also accept the DEFAULT filter type.
* Move the Contacts to display preference under default account
* Show a summary string for the the Contact to display preference
Bug 29185471
Change-Id: I4464d108bfe6cc52102718ba75bb869ba234cfc8
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 271d071..3d1ce15 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -385,6 +385,9 @@
<!-- Contact list filter selection indicating that the list shows only the selected contact [CHAR LIMIT=64] -->
<string name="list_filter_single">Contact</string>
+ <!-- Contact list filter preference summary indicating that the list shows groups chosen by the user [CHAR LIMIT=64] -->
+ <string name="list_filter_custom_preference">Custom view</string>
+
<!-- List title for a special contacts group that covers all contacts. [CHAR LIMIT=25] -->
<string name="display_ungrouped">All other contacts</string>
diff --git a/res-common/xml/preference_display_options.xml b/res-common/xml/preference_display_options.xml
index 44a991f..f7a6514 100644
--- a/res-common/xml/preference_display_options.xml
+++ b/res-common/xml/preference_display_options.xml
@@ -32,6 +32,11 @@
android:title="@string/default_editor_account"
android:dialogTitle="@string/default_editor_account" />
+ <Preference
+ android:icon="@null"
+ android:key="customContactsFilter"
+ android:title="@string/menu_contacts_filter"/>
+
<com.android.contacts.common.preference.SortOrderPreference
android:icon="@null"
android:key="sortOrder"
@@ -46,11 +51,6 @@
<Preference
android:icon="@null"
- android:key="customContactsFilter"
- android:title="@string/menu_contacts_filter"/>
-
- <Preference
- android:icon="@null"
android:key="importExport"
android:title="@string/menu_import_export"/>