diff options
| author | Tony Mantler <nicoya@google.com> | 2014-08-20 16:25:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 22:53:25 +0000 |
| commit | f1af847714c0d21ac5be88d95672403367a1cb81 (patch) | |
| tree | bf196e88dbcca94f3266f9727622f247de4de15a /res | |
| parent | 3c24b9920c3badec278a79922807744a93f04a4c (diff) | |
| parent | ea4324463814230a49dbfd07232416548ddcee45 (diff) | |
| download | android_packages_apps_UnifiedEmail-f1af847714c0d21ac5be88d95672403367a1cb81.tar.gz android_packages_apps_UnifiedEmail-f1af847714c0d21ac5be88d95672403367a1cb81.tar.bz2 android_packages_apps_UnifiedEmail-f1af847714c0d21ac5be88d95672403367a1cb81.zip | |
Merge "Tweak swipe to archive/delete prefs" into ub-gmail-ur14-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 21 | ||||
| -rw-r--r-- | res/xml/general_preferences.xml | 2 |
2 files changed, 9 insertions, 14 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 94071d86b..67af422b0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -798,26 +798,23 @@ <string name="silent_ringtone">Silent</string> <!-- Settings screen, preference name for archive vs. delete [CHAR LIMIT=50] --> - <string name="preference_removal_action_title">Archive & delete actions</string> + <string name="preference_removal_action_title">Default action</string> <!-- Options to select from for whether to have archive or delete as the remove action [CHAR LIMIT=50] --> <string-array name="prefEntries_removal_action"> - <item>Show archive only</item> - <item>Show delete only</item> - <item>Show archive & delete</item> + <item>Archive</item> + <item>Delete</item> </string-array> <!-- Description of currently selected option of whether to use archive or delete as remove action [CHAR LIMIT=200] --> <string-array name="prefSummaries_removal_action_summary"> - <item>Show archive only</item> - <item>Show delete only</item> - <item>Show archive & delete</item> + <item>Archive</item> + <item>Delete</item> </string-array> <string-array translatable="false" name="prefValues_removal_action"> <item>archive</item> <item>delete</item> - <item>archive-and-delete</item> </string-array> <!-- Dialog title for the choosing whether to use archive or delete as remove action [CHAR LIMIT=150] --> - <string name="prefDialogTitle_removal_action">Archive & delete actions</string> + <string name="prefDialogTitle_removal_action">Default action</string> <!-- The default value --> <string translatable="false" name="prefDefault_removal_action">archive</string> @@ -828,10 +825,8 @@ <!-- DO NOT TRANSLATE THE BELOW STRING - In order to allow overriding of this for K tablets (but not pre-K tablets), we use an indirection with the actual string defined above. --> <string name="preferences_default_reply_all_summary" translatable="false">@string/preferences_default_reply_all_summary_impl</string> - <!-- Preference name for swipe action when action is archive [CHAR LIMIT=100]--> - <string name="preference_swipe_title_archive">Swipe to archive</string> - <!-- Preference name for swipe action when action is delete [CHAR LIMIT=100]--> - <string name="preference_swipe_title_delete">Swipe to delete</string> + <!-- Preference name for swipe actions preference [CHAR LIMIT=100]--> + <string name="preference_swipe_title">Swipe actions</string> <!-- Preference description swiping in conversation list option [CHAR LIMIT=100] --> <string name="preference_swipe_description">In conversation list</string> diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml index 991d59881..cb728d68f 100644 --- a/res/xml/general_preferences.xml +++ b/res/xml/general_preferences.xml @@ -34,7 +34,7 @@ android:key="conversation-list-swipe" android:persistent="true" android:summary="@string/preference_swipe_description" - android:title="@string/preference_swipe_title_archive" /> + android:title="@string/preference_swipe_title" /> <CheckBoxPreference android:defaultValue="true" |