Revert "Add categories to Settings"
This reverts commit c9e277e3eb18cbb9c8e066a186ea2059ec5eb7cb.
Bug 28541872
Change-Id: Ia60e9ccf869db146dfea0746116ebf3b09215b9f
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 9ea5c30..f4de564 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -614,20 +614,8 @@
<!--Label of the "Sync contact metadata" setting dialog to set sync account for Lychee. [CHAR LIMIT=80]-->
<string name="sync_contact_metadata_dialog_title">Sync contact metadata</string>
- <!-- Title of preference category of my info (including "default account") [CHAR LIMIT=30]-->
- <string name="settings_my_info_title">My info</string>
-
- <!-- Title of preference category of list format (specifying how to sort contacts list) [CHAR LIMIT=30]-->
- <string name="settings_list_format_title">List format</string>
-
- <!-- Title of preference category of about (including preference "About Contacts"). [CHAR LIMIT=20]-->
- <string name="settings_about_title">About</string>
-
- <!-- Title of preference category of contacts metadata (including preference "Sync contact metadata [DOGFOOD]") [CHAR LIMIT=40]-->
- <string name="settings_metadata_title">Contacts metadata</string>
-
- <!-- Label of the "About Contacts" setting [CHAR LIMIT=30]-->
- <string name="settings_about">About Contacts</string>
+ <!-- Label of the "About" setting -->
+ <string name="setting_about">About Contacts</string>
<!-- Title of the settings activity [CHAR LIMIT=64] -->
<string name="activity_title_settings">Settings</string>
@@ -685,6 +673,9 @@
<!-- Menu item to select SIM card -->
<string name="menu_select_sim">Select SIM card</string>
+ <!-- The menu item to open the list of accounts. [CHAR LIMIT=60]-->
+ <string name="menu_accounts">Manage accounts</string>
+
<!-- The menu item to bulk import or bulk export contacts from SIM card or SD card. [CHAR LIMIT=30]-->
<string name="menu_import_export">Import/export</string>
diff --git a/res-common/xml/preference_display_options.xml b/res-common/xml/preference_display_options.xml
index ec1c7ff..632850f 100644
--- a/res-common/xml/preference_display_options.xml
+++ b/res-common/xml/preference_display_options.xml
@@ -15,43 +15,27 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
- android:key="my_info"
- android:title="@string/settings_my_info_title">
- <com.android.contacts.common.preference.DefaultAccountPreference
- android:icon="@null"
- android:key="accounts"
- android:title="@string/default_editor_account"
- android:dialogTitle="@string/default_editor_account" />
- </PreferenceCategory>
+ <com.android.contacts.common.preference.SortOrderPreference
+ android:icon="@null"
+ android:key="sortOrder"
+ android:title="@string/display_options_sort_list_by"
+ android:dialogTitle="@string/display_options_sort_list_by" />
- <PreferenceCategory
- android:key="list_format"
- android:title="@string/settings_list_format_title">
- <com.android.contacts.common.preference.SortOrderPreference
- android:icon="@null"
- android:key="sortOrder"
- android:title="@string/display_options_sort_list_by"
- android:dialogTitle="@string/display_options_sort_list_by" />
+ <com.android.contacts.common.preference.DisplayOrderPreference
+ android:icon="@null"
+ android:key="displayOrder"
+ android:title="@string/display_options_view_names_as"
+ android:dialogTitle="@string/display_options_view_names_as" />
- <com.android.contacts.common.preference.DisplayOrderPreference
- android:icon="@null"
- android:key="displayOrder"
- android:title="@string/display_options_view_names_as"
- android:dialogTitle="@string/display_options_view_names_as" />
- </PreferenceCategory>
+ <com.android.contacts.common.preference.DefaultAccountPreference
+ android:icon="@null"
+ android:key="accounts"
+ android:title="@string/default_editor_account"
+ android:dialogTitle="@string/default_editor_account" />
- <PreferenceCategory
- android:key="contacts_metadata"
- android:title="@string/settings_metadata_title">
- </PreferenceCategory>
-
- <PreferenceCategory android:title="@string/settings_about_title">
- <Preference
- android:icon="@null"
- android:key="about"
- android:title="@string/settings_about"
- android:order="@integer/about_contacts_order_number"/>
- </PreferenceCategory>
-
+ <Preference
+ android:icon="@null"
+ android:key="about"
+ android:title="@string/setting_about"
+ android:order="@integer/about_contacts_order_number"/>
</PreferenceScreen>