From 1917bcbc17b8fd262fb8e78d8906359d5b3cf8b9 Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Thu, 14 Jul 2011 17:44:00 -0700
Subject: [PATCH] Put "show all folders" in action bar

Change-Id: I4af74342b3b1eae3a94ebf6616280ebf47d14e5f
---
 res/menu/email_activity_options.xml                   | 11 ++++++++++-
 .../android/email/activity/UIControllerOnePane.java   |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/res/menu/email_activity_options.xml b/res/menu/email_activity_options.xml
index 27240fe86..feb7f9cbe 100644
--- a/res/menu/email_activity_options.xml
+++ b/res/menu/email_activity_options.xml
@@ -33,9 +33,18 @@
         android:icon="@drawable/ic_menu_compose_holo_light"
         android:showAsAction="ifRoom"
     />
+    <!-- STOPSHIP: replace with proper asset -->
+    <item
+        android:id="@+id/show_all_mailboxes"
+        android:orderInCategory="300"
+        android:alphabeticShortcut="c"
+        android:title="@string/mailbox_list_account_selector_show_all_folders"
+        android:icon="@drawable/ic_menu_move_to_holo_light"
+        android:showAsAction="ifRoom"
+    />
     <item
         android:id="@+id/refresh"
-        android:orderInCategory="300"
+        android:orderInCategory="400"
         android:alphabeticShortcut="r"
         android:title="@string/refresh_action"
         android:icon="@drawable/ic_menu_refresh_holo_light"
diff --git a/src/com/android/email/activity/UIControllerOnePane.java b/src/com/android/email/activity/UIControllerOnePane.java
index 2851bd525..54cfeaa82 100644
--- a/src/com/android/email/activity/UIControllerOnePane.java
+++ b/src/com/android/email/activity/UIControllerOnePane.java
@@ -602,6 +602,9 @@ class UIControllerOnePane extends UIControllerBase {
             case R.id.older:
                 moveToOlder();
                 return true;
+            case R.id.show_all_mailboxes:
+                showAllMailboxes();
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }