commit f46dabcf0fc2d47cc4770ec26248b19a4e708637
author Doris Ling <dling@google.com> Fri Jul 08 22:56:45 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 08 22:56:45 2016 +0000
tree f8505f45d218234d3d68e8791fdcf54c6660910c
parent e577ed1b918f04ad8bb6698eb82ba2d2bda43c2b
parent 6ae44a03e0d79cb12180888981128164aec22867

Merge "Add summary for Settings->Gestures." into nyc-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6b79f19..e633741 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2933,6 +2933,8 @@
                        android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.gestures.GestureSettings" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/gesture_preference_summary" />
         </activity>
 
         <activity android:name="BackupSettingsActivity"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b35ef5b..39ad0cd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7686,6 +7686,9 @@
     <!-- Preference title for gesture settings [CHAR LIMIT=25]-->
     <string name="gesture_preference_title">Gestures</string>
 
+    <!-- Preference summary for gesture settings [CHAR LIMIT=NONE]-->
+    <string name="gesture_preference_summary">Quick gestures to control your phone</string>
+
     <!-- Title text for double tap power for camera [CHAR LIMIT=60]-->
     <string name="double_tap_power_for_camera_title">Jump to Camera</string>