From d0d409e7f13bc297125183d4620f23f7ab8c377e Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Thu, 21 Aug 2014 15:20:48 -0700
Subject: String updates for general dialer settings.

+ Reorder "vibrate" to be after "dialpad tones" settings.

Bug: 16788935
Change-Id: I752ff34624b9ca44187aea5596918233644c5831
---
 res/values/strings.xml       |  6 +++---
 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
@@ -47,18 +47,18 @@
             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" />
 
+        <CheckBoxPreference
+            android:key="button_vibrate_on_ring"
+            android:title="@string/vibrate_on_ring_title"
+            android:persistent="false"
+            android:defaultValue="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
-- 
cgit v1.2.3