Fixup menus for tablet.
Fixes other part of b/6497472 update menus in mail to match jb specs
Change-Id: Ic114397b621d97ceb5299e40431a6b6939c30f9f
diff --git a/res/menu-sw600dp-port/conversation_actions.xml b/res/menu-sw600dp-port/conversation_actions.xml
index 12bf1e5..a17c20c 100644
--- a/res/menu-sw600dp-port/conversation_actions.xml
+++ b/res/menu-sw600dp-port/conversation_actions.xml
@@ -83,11 +83,6 @@
android:showAsAction="never"
android:visible="false" />
- <!-- Available for Folders with SUPPORTS_SETTINGS capability -->
- <item android:id="@+id/folder_options"
- android:title="@string/menu_folder_options"
- android:showAsAction="never" />
-
<item android:id="@+id/settings"
android:title="@string/menu_settings"
android:showAsAction="never" />
diff --git a/res/menu-sw600dp-port/conversation_search_results_actions.xml b/res/menu-sw600dp-port/conversation_search_results_actions.xml
index 1e91daa..14c7372 100644
--- a/res/menu-sw600dp-port/conversation_search_results_actions.xml
+++ b/res/menu-sw600dp-port/conversation_search_results_actions.xml
@@ -18,13 +18,6 @@
<!-- Action bar items for the tablet when viewing a conversation -->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item
- android:id="@+id/archive"
- android:title="@string/archive"
- android:showAsAction="ifRoom"
- android:icon="@drawable/archive"
- android:alphabeticShortcut="@string/trigger_y_char" />
<item
android:id="@+id/delete"
android:title="@string/delete"
@@ -54,11 +47,6 @@
android:title="@string/mark_not_important" />
<item
- android:id="@+id/mute"
- android:title="@string/mute"
- android:showAsAction="never" />
-
- <item
android:id="@+id/report_spam"
android:title="@string/report_spam"
android:showAsAction="never"/>
diff --git a/res/menu-sw600dp/conversation_list_search_results_actions.xml b/res/menu-sw600dp/conversation_list_search_results_actions.xml
index 6490cd9..0e87b19 100644
--- a/res/menu-sw600dp/conversation_list_search_results_actions.xml
+++ b/res/menu-sw600dp/conversation_list_search_results_actions.xml
@@ -60,11 +60,6 @@
android:icon="@drawable/ic_email_caret_single" />
<item
- android:id="@+id/mute"
- android:title="@string/mute"
- android:showAsAction="never" />
-
- <item
android:id="@+id/report_spam"
android:title="@string/report_spam"
android:showAsAction="never"
diff --git a/res/menu-sw600dp/conversation_search_results_actions.xml b/res/menu-sw600dp/conversation_search_results_actions.xml
index dda6a38..42bea88 100644
--- a/res/menu-sw600dp/conversation_search_results_actions.xml
+++ b/res/menu-sw600dp/conversation_search_results_actions.xml
@@ -57,11 +57,6 @@
android:title="@string/mark_not_important" />
<item
- android:id="@+id/mute"
- android:title="@string/mute"
- android:showAsAction="never" />
-
- <item
android:id="@+id/report_spam"
android:title="@string/report_spam"
android:showAsAction="never"/>
diff --git a/res/menu/conversation_search_results_actions.xml b/res/menu/conversation_search_results_actions.xml
index 3b408f6..2739a44 100644
--- a/res/menu/conversation_search_results_actions.xml
+++ b/res/menu/conversation_search_results_actions.xml
@@ -59,10 +59,6 @@
android:icon="@drawable/ic_email_caret_single"
android:visible="false" />
- <!-- Depends on AccountCapabilities.MUTE -->
- <item
- android:id="@+id/mute"
- android:title="@string/mute" />
<!-- Depends on AccountCapabilities.REPORT_SPAM -->
<item
android:id="@+id/report_spam"
diff --git a/src/com/android/mail/browse/SelectedConversationsActionMenu.java b/src/com/android/mail/browse/SelectedConversationsActionMenu.java
index 4a7aef3..25b99d6 100644
--- a/src/com/android/mail/browse/SelectedConversationsActionMenu.java
+++ b/src/com/android/mail/browse/SelectedConversationsActionMenu.java
@@ -366,10 +366,14 @@
mFolder.name));
}
final MenuItem archive = menu.findItem(R.id.archive);
- final boolean showArchive =
+ boolean showArchive =
mAccount.supportsCapability(UIProvider.AccountCapabilities.ARCHIVE)
&& mFolder.supportsCapability(FolderCapabilities.ARCHIVE);
- archive.setVisible(showArchive);
+ if (archive == null) {
+ showArchive = false;
+ } else {
+ archive.setVisible(showArchive);
+ }
if (!showRemoveFolder && !showArchive) {
archive.setEnabled(false);
archive.setVisible(true);
@@ -388,8 +392,10 @@
mFolder.supportsCapability(FolderCapabilities.REPORT_PHISHING));
final MenuItem mute = menu.findItem(R.id.mute);
- mute.setVisible(mAccount.supportsCapability(UIProvider.AccountCapabilities.MUTE)
- && (mFolder != null && mFolder.type == FolderType.INBOX));
+ if (mute != null) {
+ mute.setVisible(mAccount.supportsCapability(UIProvider.AccountCapabilities.MUTE)
+ && (mFolder != null && mFolder.type == FolderType.INBOX));
+ }
final MenuItem markImportant = menu.findItem(R.id.mark_important);
markImportant.setVisible(showMarkImportant
&& mAccount.supportsCapability(UIProvider.AccountCapabilities.MARK_IMPORTANT));
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 760c5c5..cd9c14e 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -174,6 +174,7 @@
private final MessageLoaderCallbacks mMessageLoaderCallbacks = new MessageLoaderCallbacks();
private final ContactLoaderCallbacks mContactLoaderCallbacks = new ContactLoaderCallbacks();
+ private MenuItem mRemoveFolder;
private static final String ARG_ACCOUNT = "account";
public static final String ARG_CONVERSATION = "conversation";
@@ -232,6 +233,10 @@
// Activity is finishing, just bail.
return;
}
+ if (mRemoveFolder != null) {
+ mRemoveFolder.setTitle(mActivity.getActivityContext().getString(R.string.remove_folder,
+ mFolder.name));
+ }
mTemplates = new HtmlConversationTemplates(mContext);
mAdapter = new ConversationViewAdapter(mActivity.getActivityContext(), mAccount,
@@ -382,13 +387,7 @@
Utils.setMenuItemVisibility(menu, R.id.archive, archiveVisible);
Utils.setMenuItemVisibility(menu, R.id.remove_folder, !archiveVisible && mFolder != null
&& mFolder.supportsCapability(FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES));
- if (mFolder != null) {
- final MenuItem removeFolder = menu.findItem(R.id.remove_folder);
- if (removeFolder != null) {
- removeFolder.setTitle(mActivity.getActivityContext().getString(
- R.string.remove_folder, mFolder.name));
- }
- }
+ mRemoveFolder = menu.findItem(R.id.remove_folder);
Utils.setMenuItemVisibility(menu, R.id.report_spam,
mAccount.supportsCapability(AccountCapabilities.REPORT_SPAM) && mFolder != null
&& mFolder.supportsCapability(FolderCapabilities.REPORT_SPAM)