Changing preferences to PreferenceActivity.
Change-Id: I30f76e94c22828a9516cf2a72a2a772e0b4da44c
diff --git a/res/menu/actions.xml b/res/menu/actions.xml
index 282f996..496b138 100644
--- a/res/menu/actions.xml
+++ b/res/menu/actions.xml
@@ -21,9 +21,9 @@
android:showAsAction="always" />
<item
- android:id="@+id/menu_display_groups"
- android:icon="@*android:drawable/ic_menu_allfriends"
- android:title="@string/menu_displayGroup" />
+ android:id="@+id/menu_settings"
+ android:icon="@*android:drawable/ic_menu_preferences"
+ android:title="@string/menu_settings" />
<item
android:id="@+id/menu_accounts"
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 48923fe..439d68c 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -44,8 +44,9 @@
<item name="list_item_photo_size">64dip</item>
</style>
- <style name="ContactsPreferencesTheme" parent="@android:Theme.Dialog">
+ <style name="ContactsPreferencesTheme" parent="@android:Theme.Light.Holo">
</style>
+
<style name="CallDetailActivityTheme" parent="@android:Theme.Dialog">
<item name="android:windowContentOverlay">@null</item>
</style>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0a88e78..fa712e1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -260,12 +260,6 @@
For example, this may be used to set a phone number's label to "Vaction house" -->
<string name="customLabelPickerTitle">Custom label name</string>
- <!-- The menu item to open the list of groups to display -->
- <string name="menu_displayGroup">Display options</string>
-
- <!-- Title of activity that lets user pick which contact groups to display -->
- <string name="displayGroups">Display options</string>
-
<!-- Check box label that allows calls to the contact to be sent directly to voicemail -->
<string name="send_to_voicemail_checkbox">Send calls directly to voicemail</string>
@@ -1329,4 +1323,14 @@
<!-- Title of the activity that allows the user to customize filtering of contact list [CHAR LIMIT=128] -->
<string name="custom_list_filter">Custom contact list</string>
+
+ <!-- Title of the settings activity [CHAR LIMIT=64] -->
+ <string name="activity_title_settings">Settings</string>
+
+ <!-- Menu item for the settings activity [CHAR LIMIT=64] -->
+ <string name="menu_settings">Settings</string>
+
+ <!-- The preference section title for contact display options [CHAR LIMIT=128] -->
+ <string name="preference_displayOptions">Display options</string>
+
</resources>
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
new file mode 100644
index 0000000..a662efa
--- /dev/null
+++ b/res/xml/preference_display_options.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <PreferenceCategory
+ android:title="@string/preference_displayOptions">
+ <com.android.contacts.preference.SortOrderPreference
+ android:key="sortOrder"
+ android:title="@string/display_options_sort_list_by"
+ android:dialogTitle="@string/display_options_sort_list_by" />
+
+ <com.android.contacts.preference.DisplayOrderPreference
+ android:key="sortOrder"
+ android:title="@string/display_options_view_names_as"
+ android:dialogTitle="@string/display_options_view_names_as" />
+ </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml
new file mode 100644
index 0000000..ed709fc
--- /dev/null
+++ b/res/xml/preference_headers.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<preference-headers
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <header
+ android:fragment="com.android.contacts.preference.DisplayOptionsPreferenceFragment"
+ android:title="@string/preference_displayOptions" />
+
+</preference-headers>