diff options
| author | Rohan Shah <shahrk@google.com> | 2014-08-17 16:29:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 03:56:00 +0000 |
| commit | d5ff7cd502eae841df2b38a6befc24363f01fe9a (patch) | |
| tree | acde069040b8258fa6ccbc76ee1a2c7f6fc1a379 /src | |
| parent | 24cfa0778a966620112a5b2ca90b70c8ab8e40d9 (diff) | |
| parent | 69419bb35240747d14765d4c74d4c2de58f4f8c5 (diff) | |
| download | android_packages_apps_UnifiedEmail-d5ff7cd502eae841df2b38a6befc24363f01fe9a.tar.gz android_packages_apps_UnifiedEmail-d5ff7cd502eae841df2b38a6befc24363f01fe9a.tar.bz2 android_packages_apps_UnifiedEmail-d5ff7cd502eae841df2b38a6befc24363f01fe9a.zip | |
Merge "Disable Change Folder if account does not support it" into ub-gmail-ur14-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/browse/SelectedConversationsActionMenu.java | 7 | ||||
| -rw-r--r-- | src/com/android/mail/ui/ActionBarController.java | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/mail/browse/SelectedConversationsActionMenu.java b/src/com/android/mail/browse/SelectedConversationsActionMenu.java index 380fe428a..ed4782604 100644 --- a/src/com/android/mail/browse/SelectedConversationsActionMenu.java +++ b/src/com/android/mail/browse/SelectedConversationsActionMenu.java @@ -362,6 +362,9 @@ public class SelectedConversationsActionMenu implements ActionMode.Callback, boolean showMarkNotSpam = false; boolean showMarkAsPhishing = false; + // TODO(shahrk): Clean up these dirty calls using Utils.setMenuItemVisibility(...) or + // in another way + for (Conversation conversation : conversations) { if (!conversation.starred) { showStar = true; @@ -409,6 +412,10 @@ public class SelectedConversationsActionMenu implements ActionMode.Callback, moveTo.setVisible(showMoveTo); moveToInbox.setVisible(showMoveToInbox); + final MenuItem changeFolders = menu.findItem(R.id.change_folders); + changeFolders.setVisible(mAccount.supportsCapability( + UIProvider.AccountCapabilities.MULTIPLE_FOLDERS_PER_CONV)); + if (mFolder != null && showRemoveFolder) { removeFolder.setTitle(mActivity.getActivityContext().getString(R.string.remove_folder, mFolder.name)); diff --git a/src/com/android/mail/ui/ActionBarController.java b/src/com/android/mail/ui/ActionBarController.java index 05bfe1152..c73ebd0f5 100644 --- a/src/com/android/mail/ui/ActionBarController.java +++ b/src/com/android/mail/ui/ActionBarController.java @@ -567,6 +567,8 @@ public class ActionBarController implements ViewMode.ModeChangeListener, && mFolder.supportsCapability(FolderCapabilities.ALLOWS_REMOVE_CONVERSATION)); Utils.setMenuItemVisibility(menu, R.id.move_to_inbox, mFolder != null && mFolder.supportsCapability(FolderCapabilities.ALLOWS_MOVE_TO_INBOX)); + Utils.setMenuItemVisibility(menu, R.id.change_folders, mAccount.supportsCapability( + UIProvider.AccountCapabilities.MULTIPLE_FOLDERS_PER_CONV)); final MenuItem removeFolder = menu.findItem(R.id.remove_folder); if (mFolder != null && removeFolder != null) { |