Update menus to match jb.

Fixes b/6497472 update menus in mail to match jb specs

Change-Id: I37f3799074aafa3796b45b4acf1eabf6ae047726
diff --git a/res/menu-sw600dp/conversation_actions.xml b/res/menu-sw600dp/conversation_actions.xml
new file mode 100644
index 0000000..83ff9f4
--- /dev/null
+++ b/res/menu-sw600dp/conversation_actions.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012 Google Inc.
+     Licensed to The Android Open Source Project.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- Action bar items for the tablet when viewing a conversation -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/compose"
+        android:title="@string/menu_compose"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_menu_compose_normal_holo_light"
+        android:alphabeticShortcut="@string/trigger_compose_char" />
+
+    <item android:id="@+id/search"
+        android:title="@string/menu_search"
+        android:showAsAction="ifRoom|collapseActionView"
+        android:icon="@drawable/ic_menu_search_holo_light"
+        android:actionLayout="@layout/gmail_actionbar_searchview" />
+
+    <item
+        android:id="@+id/y_button"
+        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"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/trash" />
+
+    <!-- Always available -->
+    <item
+        android:id="@+id/change_folder"
+        android:title="@string/menu_change_folders"
+        android:showAsAction="never"
+        android:icon="@drawable/ic_menu_folders_holo_light" />
+
+    <item android:id="@+id/inside_conversation_unread"
+        android:title="@string/mark_unread"
+        android:showAsAction="never"
+        android:icon="@drawable/ic_menu_mark_unread_holo_light" />
+
+    <item
+        android:id="@+id/mark_important"
+        android:showAsAction="never"
+        android:title="@string/mark_important" />
+
+    <item
+        android:id="@+id/mark_not_important"
+        android:title="@string/mark_not_important"
+        android:showAsAction="never" />
+
+    <item
+        android:id="@+id/mute"
+        android:title="@string/mute"
+        android:showAsAction="never" />
+
+    <item
+        android:id="@+id/report_spam"
+        android:title="@string/report_spam"
+        android:icon="@drawable/ic_spam_normal_holo_light"
+        android:showAsAction="never"/>
+
+    <item android:id="@+id/refresh"
+        android:title="@string/refresh"
+        android:showAsAction="never"
+        android:icon="@drawable/ic_menu_refresh_holo_light"
+        android:alphabeticShortcut="@string/trigger_refresh_char" />
+
+    <!-- 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" />
+
+    <item
+        android:id="@+id/help_info_menu_item"
+        android:icon="@android:drawable/ic_menu_help"
+        android:title="@string/help_and_info"
+        android:showAsAction="never" />
+
+    <item
+        android:id="@+id/feedback_menu_item"
+        android:icon="@android:drawable/ic_menu_send"
+        android:title="@string/feedback"
+        android:showAsAction="never" />
+
+</menu>