Merge "Make sure we populate the single static account view."
diff --git a/res/layout/compose_from.xml b/res/layout/compose_from.xml
index a22821e..47ab5a6 100644
--- a/res/layout/compose_from.xml
+++ b/res/layout/compose_from.xml
@@ -39,7 +39,7 @@
style="@style/RecipientComposeFieldLayout"
android:layout_height="match_parent">
- <TextView android:id="@+id/account_name"
+ <TextView android:id="@+id/from_account_name"
android:layout_width="match_parent"
android:paddingLeft="8dip"
android:singleLine="true"
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 83a808b..9866f4f 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -154,6 +154,7 @@
private QuotedTextView mQuotedTextView;
private TextView mBodyView;
private View mFromStatic;
+ private TextView mFromStaticText;
private View mFromSpinnerWrapper;
private FromAddressSpinner mFromSpinner;
private boolean mAddingAttachment;
@@ -295,6 +296,7 @@
// mail from / save drafts to.
mFromStatic.setVisibility(
showSpinner ? View.GONE : View.VISIBLE);
+ mFromStaticText.setText(mAccount.name);
mFromSpinnerWrapper.setVisibility(
showSpinner ? View.VISIBLE : View.GONE);
}
@@ -320,6 +322,7 @@
mQuotedTextView.setRespondInlineListener(this);
mBodyView = (TextView) findViewById(R.id.body);
mFromStatic = findViewById(R.id.static_from_content);
+ mFromStaticText = (TextView) findViewById(R.id.from_account_name);
mFromSpinnerWrapper = findViewById(R.id.spinner_from_content);
mFromSpinner = (FromAddressSpinner) findViewById(R.id.from_picker);
}