From 8752347b5fd37155cce2f4402d74aa4e9e7e18b8 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Mon, 5 Jul 2010 13:41:52 +0000 Subject: [PATCH] merged archive-move-spam-buttons into trunk --- res/layout-land/message_view.xml | 144 ++++++---- res/layout/message_view.xml | 164 ++++++++---- res/menu/message_list_context.xml | 80 +++--- res/menu/message_list_option.xml | 246 ++++++++--------- res/menu/message_view_option.xml | 28 +- res/values-de/strings.xml | 6 + res/values/arrays.xml | 180 +++++++------ res/values/strings.xml | 10 + res/xml/account_settings_preferences.xml | 94 ++++--- src/com/fsck/k9/Account.java | 38 +++ src/com/fsck/k9/activity/MessageList.java | 148 ++++++++++- src/com/fsck/k9/activity/MessageView.java | 249 ++++++++++++++++-- .../k9/activity/setup/AccountSettings.java | 26 +- 13 files changed, 995 insertions(+), 418 deletions(-) diff --git a/res/layout-land/message_view.xml b/res/layout-land/message_view.xml index 989faed87..26c9866d2 100644 --- a/res/layout-land/message_view.xml +++ b/res/layout-land/message_view.xml @@ -22,60 +22,116 @@ - -