moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-16 06:25:06 -05:00
Code Issues Releases Wiki Activity

Move "move" and "copy" out of a submenu

Browse Source
This commit is contained in:
Jesse Vincent 2012-09-08 22:55:43 -04:00 committed by Andrew Chen
parent 9fbb2b4836
commit 87e437b388
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
res/menu/message_view_option.xml
View File

@ -52,21 +52,15 @@
android:showAsAction="ifRoom" android:showAsAction="ifRoom"
/> />
<item <item
android:id="@+id/move_or_copy" android:id="@+id/move"
android:title="@string/move_or_copy_action" android:showAsAction="ifRoom"
android:showAsAction="ifRoom" android:icon="?attr/iconActionMoveOrCopy"
android:icon="?attr/iconActionMoveOrCopy"> android:title="@string/move_action"
<menu> />
<item <item
android:id="@+id/move" android:id="@+id/copy"
android:title="@string/move_action" android:title="@string/copy_action"
/> />
<item
android:id="@+id/copy"
android:title="@string/copy_action"
/>
</menu>
</item>
<item <item
android:id="@+id/toggle_unread" android:id="@+id/toggle_unread"
android:alphabeticShortcut="u" android:alphabeticShortcut="u"

7
src/com/fsck/k9/activity/MessageList.java
View File

@ -2792,7 +2792,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener,
menu.findItem(R.id.archive).setVisible(true); menu.findItem(R.id.archive).setVisible(true);
menu.findItem(R.id.spam).setVisible(true); menu.findItem(R.id.spam).setVisible(true);
menu.findItem(R.id.copy).setVisible(true); menu.findItem(R.id.copy).setVisible(true);
menu.findItem(R.id.move_or_copy).setVisible(true);
// hide uncapable // hide uncapable
/* /*
@ -2846,7 +2845,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener,
if (mQueryString != null) { if (mQueryString != null) {
menu.findItem(R.id.move).setVisible(false); menu.findItem(R.id.move).setVisible(false);
menu.findItem(R.id.copy).setVisible(false); menu.findItem(R.id.copy).setVisible(false);
menu.findItem(R.id.move_or_copy).setVisible(false);
menu.findItem(R.id.archive).setVisible(false); menu.findItem(R.id.archive).setVisible(false);
menu.findItem(R.id.spam).setVisible(false); menu.findItem(R.id.spam).setVisible(false);
@ -2865,11 +2863,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener,
menu.findItem(R.id.spam).setVisible(false); menu.findItem(R.id.spam).setVisible(false);
} }
if (!mController.isMoveCapable(mAccount)
&& !mController.isCopyCapable(mAccount)) {
menu.findItem(R.id.move_or_copy).setVisible(false);
}
if (!mAccount.hasArchiveFolder()) { if (!mAccount.hasArchiveFolder()) {
menu.findItem(R.id.archive).setVisible(false); menu.findItem(R.id.archive).setVisible(false);
} }