am 6fc974f2: Merge "String updates for general dialer settings." into lmp-dev
* commit '6fc974f2e8cb2bb1e084acc54dca149b6d191c6b':
String updates for general dialer settings.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5098369..f9bd79e 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 ecccdfd..7410211 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