Merge "Remove subtitle from "Confirm before X" preferences" into jb-ub-mail-ur10

This commit is contained in:
Tony Mantler 2013-09-11 20:27:18 +00:00 committed by Android (Google) Code Review
commit 9ae3ae576a
2 changed files with 4 additions and 4 deletions

View File

@ -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] -->

View File

@ -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"