commit f6b6ce79d99cf4266043f848c7ac274cfcf76a7d
author Mindy Pereira <mindyp@google.com> Tue Apr 03 17:33:31 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 03 17:33:31 2012 -0700
tree eab46f577d7164dd4dca99879b730d8353287913
parent a46a57f2ea73dd8106966598631625bc4cb85ef0
parent ff9aff3c28c4c20c7866ebfaaa642997e324f274

Merge "If provider doesn't support archive, turn off swipe."

src/com/android/mail/AccountSpinnerAdapter.java

diff --git a/src/com/android/mail/AccountSpinnerAdapter.java b/src/com/android/mail/AccountSpinnerAdapter.java
index bc25849..cff332b 100644
--- a/src/com/android/mail/AccountSpinnerAdapter.java
+++ b/src/com/android/mail/AccountSpinnerAdapter.java
@@ -297,4 +297,12 @@
         // The header is not enabled, so return false here.
         return false;
     }
+
+    /**
+     * Notify that the folder has changed.
+     */
+    public void onFolderUpdated(Folder folder) {
+        mCurrentFolder = folder;
+        notifyDataSetChanged();
+    }
 }

src/com/android/mail/ui/AbstractActivityController.java

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index dcf1671..fb45614 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -1126,6 +1126,7 @@
                     // Stop the spinner here.
                     mActionBarView.onRefreshStopped(folder.lastSyncResult);
                 }
+                mActionBarView.onFolderUpdated(folder);
                 if (mConversationListFragment != null) {
                     mConversationListFragment.onFolderUpdated(folder);
                 }

src/com/android/mail/ui/ActionBarView.java

diff --git a/src/com/android/mail/ui/ActionBarView.java b/src/com/android/mail/ui/ActionBarView.java
index 2206bec..de33db5 100644
--- a/src/com/android/mail/ui/ActionBarView.java
+++ b/src/com/android/mail/ui/ActionBarView.java
@@ -425,4 +425,11 @@
         mController.onSearchRequested(query);
         return true;
     }
+
+    /**
+     * Notify that the folder has changed.
+     */
+    public void onFolderUpdated(Folder folder) {
+        mSpinner.onFolderUpdated(folder);
+    }
 }