Unify general settings
Add mechanism for Email to subclass General Prefs, to remove archive-related prefs
Also tidy up some resources
b/9566150
Change-Id: I7f367302dd8c62102e227800bc7bf037d38fb788
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 31c4a3b..4b990fd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -701,13 +701,7 @@
<!-- General preference: Label of the setting for the direction to move to
when deleting the current message.
Options contain "newer message","older message", etc. [CHAR LIMIT=32] -->
- <string name="auto_advance_label">Auto-advance</string>
-
- <!-- General preference: Description of the setting for the direction to move to
- when deleting the current message.
- Options contain "newer message","older message", etc. [CHAR LIMIT=64] -->
- <string name="auto_advance_summary">Choose which screen to show after you
- delete a message</string>
+ <string name="preference_advance_to_title">Auto-advance</string>
<!-- Title of the dialog that appears the first time they perform an action that would cause
auto advance logic to fire [CHAR LIMIT=70] -->
@@ -1159,9 +1153,6 @@
<item>never</item>
</string-array>
- <!-- Settings screen, auto advance title [CHAR LIMIT=200]-->
- <string name="preference_advance_to_title">Auto-advance</string>
-
<!-- Settings screen, title of "Clear search history" menu item -->
<string name="clear_history_title">Clear search history</string>
<!-- Message shown in toast when the user taps "clear search history" in general preferences. [CHAR LIMIT=50] -->