From 22639a73613c039ef78bc2c3e12bfb6916253591 Mon Sep 17 00:00:00 2001 From: Leon Handreke Date: Sat, 24 Aug 2013 10:34:52 +0100 Subject: [PATCH 1/6] Make actions shown in message view menu configurable Fixes #5850. --- res/menu/message_list_option.xml | 24 +++++++ res/values/strings.xml | 3 + res/xml/global_preferences.xml | 9 +++ src/com/fsck/k9/K9.java | 65 +++++++++++++++++++ src/com/fsck/k9/activity/MessageList.java | 36 ++++++---- src/com/fsck/k9/activity/setup/Prefs.java | 27 ++++++++ .../fsck/k9/preferences/GlobalSettings.java | 15 +++++ src/com/fsck/k9/preferences/Settings.java | 2 +- 8 files changed, 168 insertions(+), 13 deletions(-) diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml index 326771978..ab758f372 100644 --- a/res/menu/message_list_option.xml +++ b/res/menu/message_list_option.xml @@ -56,6 +56,30 @@ android:icon="?attr/iconActionDelete" android:showAsAction="always" android:title="@string/delete_action"/> + + + + + + + + Mark all as read Colorize missing contact pictures + + Visisble message actions + Show selected actions in the message view menu diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml index 55972b7dd..3ccbb09b1 100644 --- a/res/xml/global_preferences.xml +++ b/res/xml/global_preferences.xml @@ -225,6 +225,15 @@ android:title="@string/global_settings_messageview_fixedwidth_label" android:summary="@string/global_settings_messageview_fixedwidth_summary" /> + + validate(int version, Map> settings, From 8464a432e2a749364b4d19a1a113a9ad2ed68e2d Mon Sep 17 00:00:00 2001 From: Leon Handreke Date: Sun, 25 Aug 2013 11:35:14 +0100 Subject: [PATCH 2/6] Use named indices to get values from "visible refile actions" preference --- src/com/fsck/k9/K9.java | 1 - src/com/fsck/k9/activity/setup/Prefs.java | 48 +++++++++++-------- .../fsck/k9/preferences/GlobalSettings.java | 8 ++-- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java index 7f97144cc..dd3f2200f 100644 --- a/src/com/fsck/k9/K9.java +++ b/src/com/fsck/k9/K9.java @@ -1347,7 +1347,6 @@ public class K9 extends Application { sColorizeMissingContactPictures = enabled; } - public static boolean isMessageViewArchiveActionVisible() { return sMessageViewArchiveActionVisible; } diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java index e53f1549c..06cb3f238 100644 --- a/src/com/fsck/k9/activity/setup/Prefs.java +++ b/src/com/fsck/k9/activity/setup/Prefs.java @@ -100,6 +100,12 @@ public class Prefs extends K9PreferenceActivity { private static final int ACTIVITY_CHOOSE_FOLDER = 1; + // Named indices for the mVisibleRefileActions field + private static final int VISIBLE_REFILE_ACTIONS_DELETE = 0; + private static final int VISIBLE_REFILE_ACTIONS_ARCHIVE = 1; + private static final int VISIBLE_REFILE_ACTIONS_MOVE = 2; + private static final int VISIBLE_REFILE_ACTIONS_COPY = 3; + private static final int VISIBLE_REFILE_ACTIONS_SPAM = 4; private ListPreference mLanguage; private ListPreference mTheme; @@ -413,20 +419,19 @@ public class Prefs extends K9PreferenceActivity { mWrapFolderNames.setChecked(K9.wrapFolderNames()); mVisibleRefileActions = (CheckBoxListPreference) findPreference(PREFERENCE_MESSAGEVIEW_VISIBLE_REFILE_ACTIONS); - CharSequence[] visibleRefileActionsEntries = { - getString(R.string.delete_action), - getString(R.string.archive_action), - getString(R.string.move_action), - getString(R.string.copy_action), - getString(R.string.spam_action), - }; - boolean[] visibleRefileActionsValues = { - K9.isMessageViewDeleteActionVisible(), - K9.isMessageViewArchiveActionVisible(), - K9.isMessageViewMoveActionVisible(), - K9.isMessageViewCopyActionVisible(), - K9.isMessageViewSpamActionVisible(), - }; + CharSequence[] visibleRefileActionsEntries = new CharSequence[5]; + visibleRefileActionsEntries[VISIBLE_REFILE_ACTIONS_DELETE] = getString(R.string.delete_action); + visibleRefileActionsEntries[VISIBLE_REFILE_ACTIONS_ARCHIVE] = getString(R.string.archive_action); + visibleRefileActionsEntries[VISIBLE_REFILE_ACTIONS_MOVE] = getString(R.string.move_action); + visibleRefileActionsEntries[VISIBLE_REFILE_ACTIONS_COPY] = getString(R.string.copy_action); + visibleRefileActionsEntries[VISIBLE_REFILE_ACTIONS_SPAM] = getString(R.string.spam_action); + + boolean[] visibleRefileActionsValues = new boolean[5]; + visibleRefileActionsValues[VISIBLE_REFILE_ACTIONS_DELETE] = K9.isMessageViewDeleteActionVisible(); + visibleRefileActionsValues[VISIBLE_REFILE_ACTIONS_ARCHIVE] = K9.isMessageViewArchiveActionVisible(); + visibleRefileActionsValues[VISIBLE_REFILE_ACTIONS_MOVE] = K9.isMessageViewMoveActionVisible(); + visibleRefileActionsValues[VISIBLE_REFILE_ACTIONS_COPY] = K9.isMessageViewCopyActionVisible(); + visibleRefileActionsValues[VISIBLE_REFILE_ACTIONS_SPAM] = K9.isMessageViewSpamActionVisible(); mVisibleRefileActions.setItems(visibleRefileActionsEntries); mVisibleRefileActions.setCheckedItems(visibleRefileActionsValues); @@ -500,11 +505,16 @@ public class Prefs extends K9PreferenceActivity { K9.setMobileOptimizedLayout(mMobileOptimizedLayout.isChecked()); K9.setAutofitWidth(mAutofitWidth.isChecked()); K9.setQuietTimeEnabled(mQuietTimeEnabled.isChecked()); - K9.setMessageViewDeleteActionVisible(mVisibleRefileActions.getCheckedItems()[0]); - K9.setMessageViewArchiveActionVisible(mVisibleRefileActions.getCheckedItems()[1]); - K9.setMessageViewMoveActionVisible(mVisibleRefileActions.getCheckedItems()[2]); - K9.setMessageViewCopyActionVisible(mVisibleRefileActions.getCheckedItems()[3]); - K9.setMessageViewSpamActionVisible(mVisibleRefileActions.getCheckedItems()[4]); + K9.setMessageViewDeleteActionVisible( + mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_DELETE]); + K9.setMessageViewArchiveActionVisible( + mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_ARCHIVE]); + K9.setMessageViewMoveActionVisible( + mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_MOVE]); + K9.setMessageViewCopyActionVisible( + mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_COPY]); + K9.setMessageViewSpamActionVisible( + mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_SPAM]); K9.setQuietTimeStarts(mQuietTimeStarts.getTime()); K9.setQuietTimeEnds(mQuietTimeEnds.getTime()); diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java index f19a8a25d..79066d7d6 100644 --- a/src/com/fsck/k9/preferences/GlobalSettings.java +++ b/src/com/fsck/k9/preferences/GlobalSettings.java @@ -234,16 +234,16 @@ public class GlobalSettings { new V(30, new BooleanSetting(true)) )); s.put("messageViewArchiveActionVisible", Settings.versions( - new V(30, new BooleanSetting(true)) + new V(30, new BooleanSetting(false)) )); s.put("messageViewMoveActionVisible", Settings.versions( - new V(30, new BooleanSetting(true)) + new V(30, new BooleanSetting(false)) )); s.put("messageViewCopyActionVisible", Settings.versions( - new V(30, new BooleanSetting(true)) + new V(30, new BooleanSetting(false)) )); s.put("messageViewSpamActionVisible", Settings.versions( - new V(30, new BooleanSetting(true)) + new V(30, new BooleanSetting(false)) )); SETTINGS = Collections.unmodifiableMap(s); From ee9246b4f921fa9e8ab3bca0925afd0c88ed754c Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 29 Aug 2013 17:32:35 +0200 Subject: [PATCH 3/6] Fix code style/formatting --- src/com/fsck/k9/K9.java | 46 +++++++++++------------ src/com/fsck/k9/activity/MessageList.java | 18 ++++----- src/com/fsck/k9/activity/setup/Prefs.java | 20 ++++------ 3 files changed, 38 insertions(+), 46 deletions(-) diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java index dd3f2200f..5b3e20bbc 100644 --- a/src/com/fsck/k9/K9.java +++ b/src/com/fsck/k9/K9.java @@ -262,13 +262,13 @@ public class K9 extends Application { private static boolean sThreadedViewEnabled = true; private static SplitViewMode sSplitViewMode = SplitViewMode.NEVER; private static boolean sColorizeMissingContactPictures = true; - + private static boolean sMessageViewArchiveActionVisible = false; private static boolean sMessageViewDeleteActionVisible = true; private static boolean sMessageViewMoveActionVisible = false; private static boolean sMessageViewCopyActionVisible = false; private static boolean sMessageViewSpamActionVisible = false; - + /** * @see #areDatabasesUpToDate() @@ -548,13 +548,13 @@ public class K9 extends Application { editor.putBoolean("threadedView", sThreadedViewEnabled); editor.putString("splitViewMode", sSplitViewMode.name()); editor.putBoolean("colorizeMissingContactPictures", sColorizeMissingContactPictures); - + editor.putBoolean("messageViewArchiveActionVisible", sMessageViewArchiveActionVisible); editor.putBoolean("messageViewDeleteActionVisible", sMessageViewDeleteActionVisible); editor.putBoolean("messageViewMoveActionVisible", sMessageViewMoveActionVisible); editor.putBoolean("messageViewCopyActionVisible", sMessageViewCopyActionVisible); editor.putBoolean("messageViewSpamActionVisible", sMessageViewSpamActionVisible); - + fontSizes.save(editor); } @@ -779,13 +779,13 @@ public class K9 extends Application { } sColorizeMissingContactPictures = sprefs.getBoolean("colorizeMissingContactPictures", true); - + sMessageViewArchiveActionVisible = sprefs.getBoolean("messageViewArchiveActionVisible", false); sMessageViewDeleteActionVisible = sprefs.getBoolean("messageViewDeleteActionVisible", true); sMessageViewMoveActionVisible = sprefs.getBoolean("messageViewMoveActionVisible", false); sMessageViewCopyActionVisible = sprefs.getBoolean("messageViewCopyActionVisible", false); sMessageViewSpamActionVisible = sprefs.getBoolean("messageViewSpamActionVisible", false); - + K9.setK9Language(sprefs.getString("language", "")); @@ -1348,47 +1348,43 @@ public class K9 extends Application { } public static boolean isMessageViewArchiveActionVisible() { - return sMessageViewArchiveActionVisible; + return sMessageViewArchiveActionVisible; } - public static void setMessageViewArchiveActionVisible(boolean messageViewArchiveActionVisible) { - sMessageViewArchiveActionVisible = messageViewArchiveActionVisible; + public static void setMessageViewArchiveActionVisible(boolean visible) { + sMessageViewArchiveActionVisible = visible; } public static boolean isMessageViewDeleteActionVisible() { - return sMessageViewDeleteActionVisible; + return sMessageViewDeleteActionVisible; } - public static void setMessageViewDeleteActionVisible( - boolean messageViewDeleteActionVisible) { - sMessageViewDeleteActionVisible = messageViewDeleteActionVisible; + public static void setMessageViewDeleteActionVisible(boolean visible) { + sMessageViewDeleteActionVisible = visible; } public static boolean isMessageViewMoveActionVisible() { - return sMessageViewMoveActionVisible; + return sMessageViewMoveActionVisible; } - public static void setMessageViewMoveActionVisible( - boolean messageViewMoveActionVisible) { - sMessageViewMoveActionVisible = messageViewMoveActionVisible; + public static void setMessageViewMoveActionVisible(boolean visible) { + sMessageViewMoveActionVisible = visible; } public static boolean isMessageViewCopyActionVisible() { - return sMessageViewCopyActionVisible; + return sMessageViewCopyActionVisible; } - public static void setMessageViewCopyActionVisible( - boolean messageViewCopyActionVisible) { - sMessageViewCopyActionVisible = messageViewCopyActionVisible; + public static void setMessageViewCopyActionVisible(boolean visible) { + sMessageViewCopyActionVisible = visible; } public static boolean isMessageViewSpamActionVisible() { - return sMessageViewSpamActionVisible; + return sMessageViewSpamActionVisible; } - public static void setMessageViewSpamActionVisible( - boolean messageViewSpamActionVisible) { - sMessageViewSpamActionVisible = messageViewSpamActionVisible; + public static void setMessageViewSpamActionVisible(boolean visible) { + sMessageViewSpamActionVisible = visible; } /** diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index 6e235d516..e578ee137 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -1031,23 +1031,23 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme menu.findItem(R.id.delete).setVisible(K9.isMessageViewDeleteActionVisible()); menu.findItem(R.id.copy).setVisible(mMessageViewFragment.isCopyCapable() - && K9.isMessageViewCopyActionVisible()); + && K9.isMessageViewCopyActionVisible()); menu.findItem(R.id.move).setVisible(mMessageViewFragment.isMoveCapable() - && K9.isMessageViewMoveActionVisible()); + && K9.isMessageViewMoveActionVisible()); menu.findItem(R.id.archive).setVisible(mMessageViewFragment.isMoveCapable() - && mMessageViewFragment.canMessageBeArchived() - && K9.isMessageViewArchiveActionVisible()); + && mMessageViewFragment.canMessageBeArchived() + && K9.isMessageViewArchiveActionVisible()); menu.findItem(R.id.spam).setVisible(mMessageViewFragment.isMoveCapable() - && mMessageViewFragment.canMessageBeMovedToSpam() - && K9.isMessageViewSpamActionVisible()); - + && mMessageViewFragment.canMessageBeMovedToSpam() + && K9.isMessageViewSpamActionVisible()); + Menu refileSubmenu = menu.findItem(R.id.refile).getSubMenu(); refileSubmenu.findItem(R.id.copy).setVisible(mMessageViewFragment.isCopyCapable()); refileSubmenu.findItem(R.id.move).setVisible(mMessageViewFragment.isMoveCapable()); refileSubmenu.findItem(R.id.archive).setVisible(mMessageViewFragment.isMoveCapable() - && mMessageViewFragment.canMessageBeArchived()); + && mMessageViewFragment.canMessageBeArchived()); refileSubmenu.findItem(R.id.spam).setVisible(mMessageViewFragment.isMoveCapable() - && mMessageViewFragment.canMessageBeMovedToSpam()); + && mMessageViewFragment.canMessageBeMovedToSpam()); if (mMessageViewFragment.allHeadersVisible()) { menu.findItem(R.id.show_headers).setVisible(false); diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java index 06cb3f238..dfbec1167 100644 --- a/src/com/fsck/k9/activity/setup/Prefs.java +++ b/src/com/fsck/k9/activity/setup/Prefs.java @@ -435,8 +435,7 @@ public class Prefs extends K9PreferenceActivity { mVisibleRefileActions.setItems(visibleRefileActionsEntries); mVisibleRefileActions.setCheckedItems(visibleRefileActionsValues); - - + mSplitViewMode = (ListPreference) findPreference(PREFERENCE_SPLITVIEW_MODE); initListPreference(mSplitViewMode, K9.getSplitViewMode().name(), mSplitViewMode.getEntries(), mSplitViewMode.getEntryValues()); @@ -505,16 +504,13 @@ public class Prefs extends K9PreferenceActivity { K9.setMobileOptimizedLayout(mMobileOptimizedLayout.isChecked()); K9.setAutofitWidth(mAutofitWidth.isChecked()); K9.setQuietTimeEnabled(mQuietTimeEnabled.isChecked()); - K9.setMessageViewDeleteActionVisible( - mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_DELETE]); - K9.setMessageViewArchiveActionVisible( - mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_ARCHIVE]); - K9.setMessageViewMoveActionVisible( - mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_MOVE]); - K9.setMessageViewCopyActionVisible( - mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_COPY]); - K9.setMessageViewSpamActionVisible( - mVisibleRefileActions.getCheckedItems()[VISIBLE_REFILE_ACTIONS_SPAM]); + + boolean[] enabledRefileActions = mVisibleRefileActions.getCheckedItems(); + K9.setMessageViewDeleteActionVisible(enabledRefileActions[VISIBLE_REFILE_ACTIONS_DELETE]); + K9.setMessageViewArchiveActionVisible(enabledRefileActions[VISIBLE_REFILE_ACTIONS_ARCHIVE]); + K9.setMessageViewMoveActionVisible(enabledRefileActions[VISIBLE_REFILE_ACTIONS_MOVE]); + K9.setMessageViewCopyActionVisible(enabledRefileActions[VISIBLE_REFILE_ACTIONS_COPY]); + K9.setMessageViewSpamActionVisible(enabledRefileActions[VISIBLE_REFILE_ACTIONS_SPAM]); K9.setQuietTimeStarts(mQuietTimeStarts.getTime()); K9.setQuietTimeEnds(mQuietTimeEnds.getTime()); From 2043df74da36c806f3555491f78280bd052732d6 Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 29 Aug 2013 18:20:03 +0200 Subject: [PATCH 4/6] Restructure code to set visibility of copy, move, archive, spam menu items In my opinion this structure makes the code much easier to read. --- src/com/fsck/k9/activity/MessageList.java | 49 +++++++++++++++-------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index e578ee137..af6dd6778 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -1030,31 +1030,46 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme menu.findItem(R.id.select_text).setVisible(Build.VERSION.SDK_INT < 16); menu.findItem(R.id.delete).setVisible(K9.isMessageViewDeleteActionVisible()); - menu.findItem(R.id.copy).setVisible(mMessageViewFragment.isCopyCapable() - && K9.isMessageViewCopyActionVisible()); - menu.findItem(R.id.move).setVisible(mMessageViewFragment.isMoveCapable() - && K9.isMessageViewMoveActionVisible()); - menu.findItem(R.id.archive).setVisible(mMessageViewFragment.isMoveCapable() - && mMessageViewFragment.canMessageBeArchived() - && K9.isMessageViewArchiveActionVisible()); - menu.findItem(R.id.spam).setVisible(mMessageViewFragment.isMoveCapable() - && mMessageViewFragment.canMessageBeMovedToSpam() - && K9.isMessageViewSpamActionVisible()); + /* + * Set visibility of copy, move, archive, spam in action bar and refile submenu + */ Menu refileSubmenu = menu.findItem(R.id.refile).getSubMenu(); - refileSubmenu.findItem(R.id.copy).setVisible(mMessageViewFragment.isCopyCapable()); - refileSubmenu.findItem(R.id.move).setVisible(mMessageViewFragment.isMoveCapable()); - refileSubmenu.findItem(R.id.archive).setVisible(mMessageViewFragment.isMoveCapable() - && mMessageViewFragment.canMessageBeArchived()); - refileSubmenu.findItem(R.id.spam).setVisible(mMessageViewFragment.isMoveCapable() - && mMessageViewFragment.canMessageBeMovedToSpam()); + + if (mMessageViewFragment.isCopyCapable()) { + menu.findItem(R.id.copy).setVisible(K9.isMessageViewCopyActionVisible()); + refileSubmenu.findItem(R.id.copy).setVisible(true); + } else { + menu.findItem(R.id.copy).setVisible(false); + refileSubmenu.findItem(R.id.copy).setVisible(false); + } + + if (mMessageViewFragment.isMoveCapable()) { + boolean canMessageBeArchived = mMessageViewFragment.canMessageBeArchived(); + boolean canMessageBeMovedToSpam = mMessageViewFragment.canMessageBeMovedToSpam(); + + menu.findItem(R.id.move).setVisible(K9.isMessageViewMoveActionVisible()); + menu.findItem(R.id.archive).setVisible(canMessageBeArchived && + K9.isMessageViewArchiveActionVisible()); + menu.findItem(R.id.spam).setVisible(canMessageBeMovedToSpam && + K9.isMessageViewSpamActionVisible()); + + refileSubmenu.findItem(R.id.move).setVisible(true); + refileSubmenu.findItem(R.id.archive).setVisible(canMessageBeArchived); + refileSubmenu.findItem(R.id.spam).setVisible(canMessageBeMovedToSpam); + } else { + menu.findItem(R.id.move).setVisible(false); + menu.findItem(R.id.archive).setVisible(false); + menu.findItem(R.id.spam).setVisible(false); + + menu.findItem(R.id.refile).setVisible(false); + } if (mMessageViewFragment.allHeadersVisible()) { menu.findItem(R.id.show_headers).setVisible(false); } else { menu.findItem(R.id.hide_headers).setVisible(false); } - } From fc14eff0977cc51d111458e636ab9ea0fefc45ad Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 29 Aug 2013 20:51:57 +0200 Subject: [PATCH 5/6] Add icon for the copy action --- res/drawable-hdpi/ic_action_copy_dark.png | Bin 0 -> 1386 bytes res/drawable-hdpi/ic_action_copy_light.png | Bin 0 -> 1373 bytes ..._or_copy_dark.png => ic_action_move_dark.png} | Bin ...r_copy_light.png => ic_action_move_light.png} | Bin ..._or_copy_dark.png => ic_action_move_dark.png} | Bin ...r_copy_light.png => ic_action_move_light.png} | Bin res/drawable-mdpi/ic_action_copy_dark.png | Bin 0 -> 1337 bytes res/drawable-mdpi/ic_action_copy_light.png | Bin 0 -> 1321 bytes ..._or_copy_dark.png => ic_action_move_dark.png} | Bin ...r_copy_light.png => ic_action_move_light.png} | Bin res/drawable-xhdpi/ic_action_copy_dark.png | Bin 0 -> 1426 bytes res/drawable-xhdpi/ic_action_copy_light.png | Bin 0 -> 1438 bytes ..._or_copy_dark.png => ic_action_move_dark.png} | Bin ...r_copy_light.png => ic_action_move_light.png} | Bin res/menu/message_list_context.xml | 3 ++- res/menu/message_list_option.xml | 9 +++++---- res/values/attrs.xml | 3 ++- res/values/themes.xml | 6 ++++-- 18 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 res/drawable-hdpi/ic_action_copy_dark.png create mode 100644 res/drawable-hdpi/ic_action_copy_light.png rename res/drawable-hdpi/{ic_action_move_or_copy_dark.png => ic_action_move_dark.png} (100%) rename res/drawable-hdpi/{ic_action_move_or_copy_light.png => ic_action_move_light.png} (100%) rename res/drawable-ldpi/{ic_action_move_or_copy_dark.png => ic_action_move_dark.png} (100%) rename res/drawable-ldpi/{ic_action_move_or_copy_light.png => ic_action_move_light.png} (100%) create mode 100644 res/drawable-mdpi/ic_action_copy_dark.png create mode 100644 res/drawable-mdpi/ic_action_copy_light.png rename res/drawable-mdpi/{ic_action_move_or_copy_dark.png => ic_action_move_dark.png} (100%) rename res/drawable-mdpi/{ic_action_move_or_copy_light.png => ic_action_move_light.png} (100%) create mode 100644 res/drawable-xhdpi/ic_action_copy_dark.png create mode 100644 res/drawable-xhdpi/ic_action_copy_light.png rename res/drawable-xhdpi/{ic_action_move_or_copy_dark.png => ic_action_move_dark.png} (100%) rename res/drawable-xhdpi/{ic_action_move_or_copy_light.png => ic_action_move_light.png} (100%) diff --git a/res/drawable-hdpi/ic_action_copy_dark.png b/res/drawable-hdpi/ic_action_copy_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..72c6bc6e213c1f730a0939be123f4f97d9aa0cfb GIT binary patch literal 1386 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi)$} z`@o#e@C|3zA3n!2w?(ypQ7YlqvKdF5|2&tii8yzFJ7c5n?gtl_H|V4t_%-35DtDYz zSPWZsZQbXPEjw~q0zSDPy84n~jyLB8xmCd`nTk&rS}ncA6ceWIRUtU%!z_XLBSKd* z6Fw%IOR-ek@Z*yzy~$<6iRZJdaJoU#&=uhhpyE=KV5>O}%*ji*7^I{aoe5RWaXRl3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVip(a_b<&Bf8w$-u=B$h0&uv~)Fba&~kx zH8eMIGKA@M$xklLP0cHT=}kfCb;79^lo)agfHu3N7G;*DrnnX5=PH0bZIy}JEfzS< zgX&Ge?G{U%di8;h(Fa8>QdGl)fawRsgeP1e2cGm(^ML8S2$-;$RILs%Ffg9?ba4!+ zxb-F~*6WCYfZwWj{5!OiAx%f8IgnHIH~}KKm}*SHX~a&^=J(ZtGRE za}PugU&?!}7Hn?CEPuEC!jscA#*=-*rISNWh^;)}%fZ3u9=%3N;P^*1n{6Fy-gjJY z;3;615aacjbflL-w@&=RqLVe+2|N;01Pi_~_+Hw?p;Hl6ljRw)*|Q^MvS83H&Bu;b zxxeOaJl2r9<8yw4^MTdP>IK5n7~LC0Z%tUi$+WZAW4qorCJWWbea!P_sZ6*nl#uN9 zcM*%QcbDyftb;S2uX<3X*wB4H`J7+v0abCvyAEYt7OG36PWZLWW^gaNwfxNyxg#<+ zGgX!cDjMV;e<{hseTk2C^UN8q{~&jPu9-uYM48>YM#x^sP|Xru$*xz`&4^G@_OZZZbloUFQV^{@4tPj l@l!anq5{jIZT^gG3|ppF2!DIDbn2{ literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_action_move_or_copy_dark.png b/res/drawable-hdpi/ic_action_move_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_move_or_copy_dark.png rename to res/drawable-hdpi/ic_action_move_dark.png diff --git a/res/drawable-hdpi/ic_action_move_or_copy_light.png b/res/drawable-hdpi/ic_action_move_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_move_or_copy_light.png rename to res/drawable-hdpi/ic_action_move_light.png diff --git a/res/drawable-ldpi/ic_action_move_or_copy_dark.png b/res/drawable-ldpi/ic_action_move_dark.png similarity index 100% rename from res/drawable-ldpi/ic_action_move_or_copy_dark.png rename to res/drawable-ldpi/ic_action_move_dark.png diff --git a/res/drawable-ldpi/ic_action_move_or_copy_light.png b/res/drawable-ldpi/ic_action_move_light.png similarity index 100% rename from res/drawable-ldpi/ic_action_move_or_copy_light.png rename to res/drawable-ldpi/ic_action_move_light.png diff --git a/res/drawable-mdpi/ic_action_copy_dark.png b/res/drawable-mdpi/ic_action_copy_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d93968e5b52ee78d35d3f27c5d957d37078fc991 GIT binary patch literal 1337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi)$G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dR<{_s z8Wb+g(kmC9FJzX6aBGM;`3Z*K3>YhD6@|nw=sOaZM3@!AP9QM!5_B-=q zKjZpU9vqj_p0#ZHaKuWY@v6gGuj&v@~l? z*{(AJJ(icZ-gs#B=k1zxG95vey)#;t`SahDIsVu6=VPM@6*78mea@@?Jh%1lSj$lR z<3-!!q~J-GOMXqe-*)LCpI6l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVip(bCPt&DG7+$-u?X(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yuGh@~r(RHE$SnZc?2=lPS(cjOR+OKs0QR(1CRVoq z9pL8TjMF@*-V~f}adpM1S0CsYeNfaQMKw$an0`P^c)|s8;7LC<518JIfC>B1(*$M) z2FBT*E{-7;x88)G^*Zbzkhf{&+KF7Owv`$$w4XTENZ7tQdi;apmvC! ztessOoGlLSTFTFu>Fr?^UUBsE^omcnst+laspUH_IPfg})Qk=DX1n>s2bvpw8(i`siRduQIC$tl{|rt0gm?8$TChdcS1rn%fx z_;7PN(`=@^#$Soqj>~rH#vXIH=+?TznMrY7y4JB{wOR+x`LqW$G=G@*;g`A9BDY_6 z!^9S}zE~8;@!gJ#Wrx$8)Bb_ay(cpBc)i_sK<58_*NdNm7C7uP&)zj#;Om2D>ir6? z{^Ct1L|j(wOH#-$(T{#q-t+jvl*c<(XJ;fgB|p5g(X)49(gWuOVzv$0?;;pm`5E7} pth2Qbk-O&iuYL}n?*s1!Mh2^WiB8;)*Ixn^UY@RgF6*2UngHK1)U*Hq literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_action_move_or_copy_dark.png b/res/drawable-mdpi/ic_action_move_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_move_or_copy_dark.png rename to res/drawable-mdpi/ic_action_move_dark.png diff --git a/res/drawable-mdpi/ic_action_move_or_copy_light.png b/res/drawable-mdpi/ic_action_move_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_move_or_copy_light.png rename to res/drawable-mdpi/ic_action_move_light.png diff --git a/res/drawable-xhdpi/ic_action_copy_dark.png b/res/drawable-xhdpi/ic_action_copy_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..04e290d8b99915220acda5e11c81f889de57abce GIT binary patch literal 1426 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0 z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=olcB4Dp`oLxlYyI|p{t>#iJ_&diIcOV zo2j9>iIX8ruSMv>2~2MaLa!4}y`aR9TL84#CABECEH%ZgC_h&L>}jh^+-|YJ zX&zK>3U0Sp;?%1Tbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3b-F)`ZBL)U07Ec$) zkcwMxW^eR6Y#`8sNvy*r3@;50@6%|?0LZqHO~dDpKj)8*z@h3 zq=Whrl^I)?aM#W6KX!QP`$_A5%=og>x%dG4%hQi{_*>@$eKY6?xpDU3-P1MSWsMp_ zFNK{n+sfKyK7Gmjt~+X{*&Z~>b6n?CUm~r^VAWuC(BnD7ODn}`YyqpS6hGyh)OyvD zxXO>?li7>ieg~=`&UJ`YbDq5<`JMUtgh(~p$>%)R7dSA>e(evZ# zPK*hbKe8`LXNI4>$5-sR&YZnL^^&@{`$5Zu-sYd@`!?*ZV(0#1I+1O`&Av3o>pidM zFkfQ4app&kt56BQ=C|TEd6gRvnaCdSnEGRa(yNAPAx*M!N_N|hTPreq_!USPJc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0 z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=GqoJ#zn~RyLlYxsNkZEaRXz6O=ryA&s6|>+A0&bTTF18 z2i2Q`+byOz_38s1qYsK&q^O1o0n-nN2~W5{4m|0n<^j`t5inu@^|SlMz`!Kn>Eakt zaqG?O{eFiH1dh!WSYdUDVa*=rd8`{h33$j#Xp5=MYnaNo@sm)XxY&#d5n3t^Ng5sY zy*qc30oZ4?B~MAxMJH~anmge&oOeevdE}Z4bW(7%} z@_-*XuZ$aXFV&r%X{EbUnuS~Fi+1KCE}(Ts3g;GhO6_F2u+z#>iM?c%--d}Sd)Eo8 zFy2@t+_ux|;OW~7O6ES;*0_!xtrz|-69QYcT!>rkJCcX36UcgYqAk&b}Xu)8~!1v)AqmBOg;47hN zb>*Jzyz^L{F8|}re8b&vg=gON_m%hR7fjQS{rs~`is{F+AE&onOxS;{{5V_0p8u|plh&!hh9*;F|nIG+9Xl2tWf*{Qp1UfB$4Ss&kZpJQ~8O?W61 zIagt$&Arc(4%ZGYR6WqRp6>gKP!S6P*UbO1NHDzFyRi1IlfizFh^MQc%Q~loCICpS08Ib@ literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_action_move_or_copy_dark.png b/res/drawable-xhdpi/ic_action_move_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_move_or_copy_dark.png rename to res/drawable-xhdpi/ic_action_move_dark.png diff --git a/res/drawable-xhdpi/ic_action_move_or_copy_light.png b/res/drawable-xhdpi/ic_action_move_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_move_or_copy_light.png rename to res/drawable-xhdpi/ic_action_move_light.png diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml index 89c1007aa..33b12b594 100644 --- a/res/menu/message_list_context.xml +++ b/res/menu/message_list_context.xml @@ -28,11 +28,12 @@ android:id="@+id/move" android:title="@string/move_action" android:showAsAction="ifRoom" - android:icon="?attr/iconActionMoveOrCopy" + android:icon="?attr/iconActionMove" /> @@ -126,13 +126,14 @@ @@ -228,7 +229,7 @@ android:id="@+id/toggle_message_view_theme" android:showAsAction="never" android:title="@string/message_view_theme_action_dark"/> - diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 9858a5ddc..dc108fa98 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -10,7 +10,8 @@ - + + diff --git a/res/values/themes.xml b/res/values/themes.xml index 017c3eb0c..a8bbb9a66 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -12,7 +12,8 @@ @drawable/ic_action_archive_light @drawable/ic_action_compose_light @drawable/ic_action_delete_light - @drawable/ic_action_move_or_copy_light + @drawable/ic_action_move_light + @drawable/ic_action_copy_light @drawable/ic_action_next_message_light @drawable/ic_action_previous_message_light @drawable/ic_action_refresh_light @@ -63,7 +64,8 @@ @drawable/ic_action_archive_dark @drawable/ic_action_compose_dark @drawable/ic_action_delete_dark - @drawable/ic_action_move_or_copy_dark + @drawable/ic_action_move_dark + @drawable/ic_action_copy_dark @drawable/ic_action_next_message_dark @drawable/ic_action_previous_message_dark @drawable/ic_action_refresh_dark From a32068f6cde667f3c62c8c8ee720fa1639af1820 Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 29 Aug 2013 21:13:28 +0200 Subject: [PATCH 6/6] Remove icons from the "Refile" submenu We don't show icons in any other submenu. --- res/menu/message_list_option.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml index cf5aff30b..09c850865 100644 --- a/res/menu/message_list_option.xml +++ b/res/menu/message_list_option.xml @@ -112,28 +112,21 @@