diff options
| author | Andrew Lee <anwlee@google.com> | 2014-08-22 00:30:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 00:30:39 +0000 |
| commit | 62f10d8deb2d2ba9119c794d5e37f562f3637a4c (patch) | |
| tree | 1ead33ba2e543c1115be94a18a2dc1f3ddfb87d3 /res | |
| parent | 1bd2a6982a76f256105c4ba130ce4adb2eb700e5 (diff) | |
| parent | 0f65b5aad1ed3909f08f8c57193e9a6761398f9c (diff) | |
am 0f65b5aa: am dffa10ea: am 6fc974f2: Merge "String updates for general dialer settings." into lmp-dev
* commit '0f65b5aad1ed3909f08f8c57193e9a6761398f9c':
String updates for general dialer settings.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/general_settings.xml | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 509836995..f9bd79e0c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -788,17 +788,17 @@ <!-- 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> + <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> + <string name="vibrate_on_ring_title">"Also vibrate for calls</string> <!-- Setting option name to enable or disable DTMF tone sound [CHAR LIMIT=30] --> - <string name="dtmf_tone_enable_title">Dialpad touch tones</string> + <string name="dtmf_tone_enable_title">Dialpad tones</string> <!-- Label for section of general call settings where miscellaneous settings are listed. --> <string name="other_settings_title">Other</string> diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml index ecccdfd29..7410211dc 100644 --- a/res/xml/general_settings.xml +++ b/res/xml/general_settings.xml @@ -48,17 +48,17 @@ 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" /> + <CheckBoxPreference + android:key="button_vibrate_on_ring" + android:title="@string/vibrate_on_ring_title" + android:persistent="false" + android:defaultValue="false" /> + </PreferenceCategory> <PreferenceCategory |