commit a83e708e162ad1f4b04b41738882bf318e217f64
author Mindy Pereira <mindyp@google.com> Fri Mar 30 08:53:11 2012 -0700
committer Mindy Pereira <mindyp@google.com> Fri Mar 30 08:53:11 2012 -0700
tree 26eef00a296c8d9966febc7998365f8e15358c94
parent 489dd22c64c718b6953b4bd6acef925e82c53c87

Don't show the from spinner for reply/replyall/from

Fixes part of b/6260630 Reply, Reply all, Forward has account selector in the From field

Change-Id: I63487ab992b30ccca06cc083b9815e50553212e2

src/com/android/mail/compose/ComposeActivity.java

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index c394b01..a7de8e9 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -310,7 +310,7 @@
         initRecipients();
         initAttachmentsFromIntent(intent);
         initActionBar(action);
-        initFromSpinner();
+        initFromSpinner(action);
         initChangeListeners();
     }
 
@@ -366,18 +366,26 @@
         getLoaderManager().restartLoader(ACCOUNT_SETTINGS_LOADER, null, this);
     }
 
-    private void initFromSpinner() {
-        mFromSpinner.setCurrentAccount(mAccount);
-        mFromSpinner.asyncInitFromSpinner();
-        boolean showSpinner = mFromSpinner.getCount() > 1;
-        // If there is only 1 account, just show that account.
-        // Otherwise, give the user the ability to choose which account to send
-        // mail from / save drafts to.
-        mFromStatic.setVisibility(
-                showSpinner ? View.GONE : View.VISIBLE);
-        mFromStaticText.setText(mAccount.name);
-        mFromSpinnerWrapper.setVisibility(
-                showSpinner ? View.VISIBLE : View.GONE);
+    private void initFromSpinner(int action) {
+        if (action == COMPOSE ||
+            (action == EDIT_DRAFT
+                && mDraft.draftType == UIProvider.DraftType.COMPOSE)) {
+            mFromSpinner.setCurrentAccount(mAccount);
+            mFromSpinner.asyncInitFromSpinner();
+            boolean showSpinner = mFromSpinner.getCount() > 1;
+            // If there is only 1 account, just show that account.
+            // Otherwise, give the user the ability to choose which account to
+            // send
+            // mail from / save drafts to.
+            mFromStatic.setVisibility(showSpinner ? View.GONE : View.VISIBLE);
+            mFromStaticText.setText(mAccount.name);
+            mFromSpinnerWrapper.setVisibility(showSpinner ? View.VISIBLE : View.GONE);
+        } else {
+            mFromStatic.setVisibility(View.VISIBLE);
+            mFromStaticText.setText(mAccount.name);
+            mFromSpinnerWrapper.setVisibility(View.GONE);
+            mFromSpinner.setCurrentAccount(mAccount);
+        }
     }
 
     private void findViews() {