From 08b2a505d08201b8ed0519a8c7853513f6192966 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Wed, 11 Sep 2013 11:28:54 -0700
Subject: [PATCH] Remove subtitle from "Confirm before X" preferences

b/10696931

Change-Id: I6353f045322d49c26b69d7e96357ec7a8ef426f8
---
 res/values/strings.xml          | 2 ++
 res/xml/general_preferences.xml | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 22f7d991e..a4b15fbe3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -697,12 +697,14 @@
     <string name="general_preference_confirm_delete_label">Confirm before deleting</string>
     <!-- General preference: Description of the setting for requiring confirmation before
          message deletion [CHAR LIMIT=64] -->
+    <!-- TODO: Delete this string, no longer used -->
     <string name="general_preference_confirm_delete_summary">Messages</string>
     <!-- General preference: Label of the setting for requiring confirmation before
          message sending [CHAR LIMIT=32] -->
     <string name="general_preference_confirm_send_label">Confirm before sending</string>
     <!-- General preference: Description of the setting for requiring confirmation before
          message sending [CHAR LIMIT=32] -->
+    <!-- TODO: Delete this string, no longer used -->
     <string name="general_preference_confirm_send_summary">Messages</string>
 
     <!-- General preference: Label of the setting for the text zoom.  [CHAR LIMIT=32] -->
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 0b9e51822..22c47d0c2 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -21,15 +21,13 @@
         android:key="confirm_delete"
         android:persistent="true"
         android:defaultValue="false"
-        android:title="@string/general_preference_confirm_delete_label"
-        android:summary="@string/general_preference_confirm_delete_summary" />
+        android:title="@string/general_preference_confirm_delete_label" />
 
     <CheckBoxPreference
         android:key="confirm_send"
         android:persistent="true"
         android:defaultValue="false"
-        android:title="@string/general_preference_confirm_send_label"
-        android:summary="@string/general_preference_confirm_send_summary" />
+        android:title="@string/general_preference_confirm_send_label" />
 
     <ListPreference
         android:key="auto_advance"