diff options
| author | Andrew Lee <anwlee@google.com> | 2015-03-06 01:08:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-06 01:08:30 +0000 |
| commit | 8321e39655e1586c752dcd3622aba3d04e5576a7 (patch) | |
| tree | 08540bc59c8863c888b2474ce0b222ad539ae6a7 /res | |
| parent | a56455b7c4719061eb8d9b636429f652042753c1 (diff) | |
| parent | c65acdff581a103b6baabd25be6fcc8be88215f0 (diff) | |
Merge "Move DTMF length setting to Sound settings."
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 14 | ||||
| -rw-r--r-- | res/xml/sound_settings.xml | 16 |
2 files changed, 25 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index db134430e..e924c3afc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -707,6 +707,18 @@ <!-- Setting option name to enable or disable DTMF tone sound [CHAR LIMIT=30] --> <string name="dtmf_tone_enable_title">Dialpad tones</string> + <!-- Label for setting to adjust the length of DTMF tone sounds. [CHAR LIMIT=40] --> + <string name="dtmf_tone_length_title">Dialpad tone length</string> + <!-- Options displayed for the length of DTMF tone sounds. [CHAR LIMIT=40] --> + <string-array name="dtmf_tone_length_entries"> + <item>Normal</item> + <item>Long</item> + </string-array> + <!-- Do not translate. --> + <string-array name="dtmf_tone_length_entry_values" translatable="false"> + <item>0</item> + <item>1</item> + </string-array> <!-- Title of settings screen for managing the "Respond via SMS" feature. [CHAR LIMIT=30] --> <string name="respond_via_sms_setting_title">Quick responses</string> @@ -723,4 +735,6 @@ <string name="vibrate_on_preference_key" translatable="false">button_vibrate_on_ring</string> <!-- DO NOT TRANSLATE. Internal key for vibrate when ringing preference. --> <string name="play_dtmf_preference_key" translatable="false">button_play_dtmf_tone</string> + <!-- DO NOT TRANSLATE. Internal key for DTMF tone length preference. --> + <string name="dtmf_tone_length_preference_key" translatable="false">button_dtmf_settings</string> </resources> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index ebe0f51f1..80fad626a 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -26,15 +26,21 @@ android:ringtoneType="ringtone" /> <CheckBoxPreference + android:key="@string/vibrate_on_preference_key" + android:title="@string/vibrate_on_ring_title" + android:persistent="false" + android:defaultValue="false" /> + + <CheckBoxPreference android:key="@string/play_dtmf_preference_key" android:title="@string/dtmf_tone_enable_title" android:persistent="false" android:defaultValue="true" /> - <CheckBoxPreference - android:key="@string/vibrate_on_preference_key" - android:title="@string/vibrate_on_ring_title" - android:persistent="false" - android:defaultValue="false" /> + <ListPreference + android:key="@string/dtmf_tone_length_preference_key" + android:title="@string/dtmf_tone_length_title" + android:entries="@array/dtmf_tone_length_entries" + android:entryValues="@array/dtmf_tone_length_entry_values" /> </PreferenceScreen> |