From c4f12f6de27ad98c4dcf7ebf3e6ef1923abef0ec Mon Sep 17 00:00:00 2001
From: Shawn Ding <shawnding@google.com>
Date: Fri, 16 Mar 2018 17:37:49 +0800
Subject: [PATCH] Update "Vibrate on tap" string

Update string "Vibrate on tap" to "Touch vibration"
,and add subtitle "Haptic feedback for tap, keyboard, and more"
into the current vibration setting.

Change-Id: I333a10080d170b7305b7e995e703c40130d0348f
Fixes: 74264519
Test: Manual test
---
 res/values/strings.xml           | 5 ++++-
 res/xml/other_sound_settings.xml | 3 ++-
 res/xml/sound_settings.xml       | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 978c2947faf..ebe285d7579 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6881,7 +6881,10 @@
     <string name="touch_sounds_title">Touch sounds</string>
 
     <!-- Sound: Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
-    <string name="vibrate_on_touch_title">Vibrate on tap</string>
+    <string name="vibrate_on_touch_title">Touch vibration</string>
+
+    <!-- Sound: Other sounds: Preference summary to the option enabling haptic feedback on touch. -->
+    <string name="vibrate_on_touch_summary">Haptic feedback for tap, keyboard, and more</string>
 
     <!-- Sound: Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
     <string name="dock_audio_media_title">Dock speaker plays</string>
diff --git a/res/xml/other_sound_settings.xml b/res/xml/other_sound_settings.xml
index 6eca62cd289..7b3f362eec8 100644
--- a/res/xml/other_sound_settings.xml
+++ b/res/xml/other_sound_settings.xml
@@ -47,7 +47,8 @@
     <!-- Vibrate on touch -->
     <SwitchPreference
             android:key="vibrate_on_touch"
-            android:title="@string/vibrate_on_touch_title" />
+            android:title="@string/vibrate_on_touch_title"
+            android:summary="@string/vibrate_on_touch_summary" />
 
     <!-- Dock speaker plays -->
     <DropDownPreference
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 9500e249877..23936a70788 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -129,7 +129,8 @@
         <!-- Vibrate on touch -->
         <SwitchPreference
           android:key="vibrate_on_touch"
-          android:title="@string/vibrate_on_touch_title" />
+          android:title="@string/vibrate_on_touch_title"
+          android:summary="@string/vibrate_on_touch_summary" />
 
         <!-- Dock speaker plays -->
         <DropDownPreference