diff options
author | Andrew Lee <anwlee@google.com> | 2015-02-26 22:18:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-26 22:18:13 +0000 |
commit | eb2097d840ac4e2f8709041cb7c9282697a309af (patch) | |
tree | b8deee744f68ec729cf258ddeb96874ec4ffb4ec /res | |
parent | 7aed923a6f4370876c1f218550220c0394024b02 (diff) | |
parent | dd9dc5ae60a991ab7e4203c4b539d1dd4811b59a (diff) |
Merge "Add DisplayOptions PreferenceFragment."
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 8 | ||||
-rw-r--r-- | res/xml/display_options.xml | 31 | ||||
-rw-r--r-- | res/xml/general_settings.xml | 17 |
3 files changed, 35 insertions, 21 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index baa774693..ab8fd2754 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -690,13 +690,13 @@ <!-- Dialer settings related strings--> + <!-- Title for "Display options" category, which controls how contacts are shown. + [CHAR LIMIT=40] --> + <string name="display_options_title">Display options</string> + <!-- Label for the general dialer settings section [CHAR LIMIT=30]--> <string name="general_settings_label">General</string> - <!-- Title for "Contact display options" category, which is shown above options which - manipulate how contacts are shown. [CHAR LIMIT=40] --> - <string name="contact_display_options_category_title">Contact display options</string> - <!-- Title for the category "sounds", which is shown above sounds and vibration related settings. [CHAR LIMIT=30] --> <string name="sounds_and_vibrate_category_title">Sounds and vibrate</string> diff --git a/res/xml/display_options.xml b/res/xml/display_options.xml new file mode 100644 index 000000000..07aadf758 --- /dev/null +++ b/res/xml/display_options.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + ~ Copyright (C) 2015 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.common.preference.SortOrderPreference + 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:key="displayOrder" + android:title="@string/display_options_view_names_as" + android:dialogTitle="@string/display_options_view_names_as" /> + +</PreferenceScreen> diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml index 29845ed8b..c856e1a46 100644 --- a/res/xml/general_settings.xml +++ b/res/xml/general_settings.xml @@ -19,23 +19,6 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory - android:key="dialer_contact_display_options_category_key" - android:title="@string/contact_display_options_category_title" - android:persistent="false"> - - <com.android.contacts.common.preference.SortOrderPreference - 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:key="displayOrder" - android:title="@string/display_options_view_names_as" - android:dialogTitle="@string/display_options_view_names_as" /> - - </PreferenceCategory> - - <PreferenceCategory android:key="dialer_general_sounds_category_key" android:title="@string/sounds_and_vibrate_category_title" android:persistent="false"> |