summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-07-10 11:38:34 -0700
committerYorke Lee <yorkelee@google.com>2014-07-14 19:22:47 -0700
commitc9bb2179ab321461f88f54d49e9d41f2f6b19fe3 (patch)
tree0809e57217f2b47d7c6301e9c452a807414548db /res/xml
parent60905ed8d56a0aec1d2785d88d74e7c7d2819113 (diff)
downloadpackages_apps_Contacts-c9bb2179ab321461f88f54d49e9d41f2f6b19fe3.tar.gz
packages_apps_Contacts-c9bb2179ab321461f88f54d49e9d41f2f6b19fe3.tar.bz2
packages_apps_Contacts-c9bb2179ab321461f88f54d49e9d41f2f6b19fe3.zip
Make ContactPreferences use SharedPreferences instead of System settings (2/5)
* Move constants that originally lived in the framework into ContactsCommon * Use SharedPreferences instead of System settings to persist preferences * Use a SharedPreferenceListener to monitor changes instead of a content observer on system settings * Move DisplayOrderPreference and SortOrderPreference into ContactsCommon so that it can be used by Dialer * Create base DialerSettingsActivity in Dialer, and make GoogleDialerSettingsActivity extend it Bug: 16153186 Change-Id: Ibaacc26619889e28db7b4b30ee37a00827dd48e4
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/preference_display_options.xml27
-rw-r--r--res/xml/preference_headers.xml2
2 files changed, 1 insertions, 28 deletions
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
deleted file mode 100644
index 4ec31b219..000000000
--- a/res/xml/preference_display_options.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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">
- <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="displayOrder"
- android:title="@string/display_options_view_names_as"
- android:dialogTitle="@string/display_options_view_names_as" />
-</PreferenceScreen>
diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml
index ed709fcc1..98019fdc5 100644
--- a/res/xml/preference_headers.xml
+++ b/res/xml/preference_headers.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<header
- android:fragment="com.android.contacts.preference.DisplayOptionsPreferenceFragment"
+ android:fragment="com.android.contacts.common.preference.DisplayOptionsPreferenceFragment"
android:title="@string/preference_displayOptions" />
</preference-headers>