diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-15 13:37:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 13:37:30 +0000 |
commit | f4a6764b9b97964215388cd13bd857929f19d565 (patch) | |
tree | 8036f246b9e3e568a44f161fa7fddd82ef1b24ca /res | |
parent | b524c06cd69bd023a0ad4b6ffdfdc10b92cff9eb (diff) | |
parent | c6ac0888ee99f36c5ea92b79b916e9bd83dc7168 (diff) |
am c6ac0888: am 44cfddd3: am e4ea104a: Add "general settings" settings menu in Dialer
* commit 'c6ac0888ee99f36c5ea92b79b916e9bd83dc7168':
Add "general settings" settings menu in Dialer
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 35 | ||||
-rw-r--r-- | res/xml/general_settings.xml | 83 |
2 files changed, 116 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 455fd5d50..509836995 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -776,9 +776,40 @@ <!-- Dialer settings related strings--> + <!-- Label for the general dialer settings section [CHAR LIMIT=30]--> + <string name="general_settings_label">General settings</string> + + <!-- Label for the general dialer settings section description [CHAR LIMIT=80]--> + <string name="general_settings_description">Contact display, sounds, and quick responses</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> + + <!-- Setting option name to pick ringtone (a list dialog comes up). [CHAR LIMIT=30] --> + <string name="ringtone_title">Phone ringtone</string> + + <!-- Setting option name to enable or disable vibration when ringing the phone. + [CHAR LIMIT=30] --> + <string name="vibrate_on_ring_title">Vibrate when ringing</string> + + <!-- Setting option name to enable or disable DTMF tone sound [CHAR LIMIT=30] --> + <string name="dtmf_tone_enable_title">Dialpad touch tones</string> + + <!-- Label for section of general call settings where miscellaneous settings are listed. --> + <string name="other_settings_title">Other</string> + + <!-- Title of settings screen for managing the "Respond via SMS" feature. [CHAR LIMIT=30] --> + <string name="respond_via_sms_setting_title">Quick responses</string> + <!-- Label for the call settings section [CHAR LIMIT=30]--> - <string name="call_settings_label">Call Settings</string> + <string name="call_settings_label">Call settings</string> <!-- Label for the call settings section description [CHAR LIMIT=80]--> - <string name="call_settings_description">Ringtones, voicemail settings, VoIP calling, etc</string> + <string name="call_settings_description">Voicemail, call waiting, and others</string> + </resources> diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml new file mode 100644 index 000000000..ecccdfd29 --- /dev/null +++ b/res/xml/general_settings.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + ~ Copyright (C) 2014 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: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"> + + <com.android.dialer.settings.DefaultRingtonePreference + android:key="button_ringtone_key" + android:title="@string/ringtone_title" + android:dialogTitle="@string/ringtone_title" + android:persistent="false" + android:ringtoneType="ringtone" /> + + <CheckBoxPreference + android:key="button_vibrate_on_ring" + android:title="@string/vibrate_on_ring_title" + android:persistent="false" + android:defaultValue="false" /> + + <CheckBoxPreference + android:key="button_play_dtmf_tone" + android:title="@string/dtmf_tone_enable_title" + android:persistent="false" + android:defaultValue="true" /> + + </PreferenceCategory> + + <PreferenceCategory + android:key="dialer_general_other_settings_category_key" + android:title="@string/other_settings_title" + android:persistent="false" > + + <PreferenceScreen + android:key="button_respond_via_sms_key" + android:title="@string/respond_via_sms_setting_title" + android:persistent="false"> + + <intent + android:action="android.intent.action.MAIN" + android:targetPackage="com.android.telecomm" + android:targetClass="com.android.telecomm.RespondViaSmsSettings$Settings" /> + + </PreferenceScreen> + + </PreferenceCategory> + +</PreferenceScreen>
\ No newline at end of file |