Allow up on the spinner

Allow taps on the spinner to expand/collapse the drawer.

We don't have the up-icon yet, that will be put in soon.

Bug: 8434484 The new gmail UI makes my experience more difficult

Change-Id: I36c74c041abcef5224ff2fdaf6fa84f2c6925634
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index 4496489..674ac4c 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -110,9 +110,7 @@
     @Override
     public void resetActionBarIcon() {
         final int mode = mViewMode.getMode();
-        if (mode == ViewMode.CONVERSATION_LIST
-                && inInbox(mAccount, mConvListContext)
-                || mViewMode.isWaitingForSync()) {
+        if (mViewMode.isWaitingForSync()) {
             mActionBarView.removeBackButton();
         } else {
             mActionBarView.setBackButton();
@@ -529,12 +527,21 @@
         final int mode = mViewMode.getMode();
         if (mode == ViewMode.SEARCH_RESULTS_LIST) {
             mActivity.finish();
-        } else if ((!inInbox(mAccount, mConvListContext) && mViewMode.isListMode())
+            // Not needed, the activity is going away anyway.
+            return true;
+        }
+        if (inInbox(mAccount, mConvListContext) && mViewMode.isListMode()) {
+            // Up affordance: show the drawer.
+            toggleFolderListState();
+            return true;
+        }
+        if (mViewMode.isListMode()
                 || mode == ViewMode.CONVERSATION
                 || mode == ViewMode.FOLDER_LIST
                 || mode == ViewMode.SEARCH_RESULTS_CONVERSATION) {
             // Same as go back.
             handleBackPress();
+            return true;
         }
         return true;
     }