Add white background to message details header.
I want to revert this change.
Change-Id: I0153e7851908b183aa68b95aad23e7aa584c3aa2
diff --git a/res/layout/conversation_message_header.xml b/res/layout/conversation_message_header.xml
index 21c111c..b4a9cbf 100644
--- a/res/layout/conversation_message_header.xml
+++ b/res/layout/conversation_message_header.xml
@@ -27,8 +27,13 @@
android:layout_marginRight="@dimen/conversation_view_margin_side" >
<include layout="@layout/conversation_message_upper_header"
- android:id="@+id/upper_header" />
+ android:id="@+id/upper_header" />
+ <LinearLayout android:id="@+id/header_extra_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/message_header_background_color"
+ android:orientation="vertical" />
<View
android:id="@+id/snap_header_bottom_border"
android:layout_width="match_parent"
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index f12baa7..9f736d5 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -114,6 +114,7 @@
private QuickContactBadge mPhotoView;
private ImageView mStarView;
private ViewGroup mTitleContainerView;
+ private ViewGroup mExtraContentView;
private ViewGroup mCollapsedDetailsView;
private ViewGroup mExpandedDetailsView;
private SpamWarningView mSpamWarningView;
@@ -283,6 +284,7 @@
mEditDraftButton = findViewById(R.id.edit_draft);
mUpperDateView = (TextView) findViewById(R.id.upper_date);
mAttachmentIcon = findViewById(R.id.attachment);
+ mExtraContentView = (ViewGroup) findViewById(R.id.header_extra_content);
mCollapsedStarVisible = mStarView.getVisibility() == VISIBLE;
final Resources resources = getResources();
@@ -1122,7 +1124,7 @@
if (mInviteView == null) {
mInviteView = (MessageInviteView) mInflater.inflate(
R.layout.conversation_message_invite, this, false);
- addView(mInviteView);
+ mExtraContentView.addView(mInviteView);
}
mInviteView.bind(mMessage);
mInviteView.setVisibility(VISIBLE);
@@ -1138,7 +1140,7 @@
if (mImagePromptView == null) {
mImagePromptView = (TextView) mInflater.inflate(
R.layout.conversation_message_show_pics, this, false);
- addView(mImagePromptView);
+ mExtraContentView.addView(mImagePromptView);
mImagePromptView.setOnClickListener(this);
}
mImagePromptView.setVisibility(VISIBLE);
@@ -1177,7 +1179,7 @@
if (mSpamWarningView == null) {
mSpamWarningView = (SpamWarningView)
mInflater.inflate(R.layout.conversation_message_spam_warning, this, false);
- addView(mSpamWarningView);
+ mExtraContentView.addView(mSpamWarningView);
}
mSpamWarningView.showSpamWarning(mMessage, mSender);
@@ -1234,7 +1236,7 @@
if (mCollapsedDetailsView == null) {
mCollapsedDetailsView = (ViewGroup) mInflater.inflate(
R.layout.conversation_message_details_header, this, false);
- addView(mCollapsedDetailsView, indexOfChild(mUpperHeaderView) + 1);
+ mExtraContentView.addView(mCollapsedDetailsView, 0);
mCollapsedDetailsView.setOnClickListener(this);
}
if (!mCollapsedDetailsValid) {
@@ -1261,7 +1263,7 @@
// lazily create expanded details view
final boolean expandedViewCreated = ensureExpandedDetailsView();
if (expandedViewCreated) {
- addView(mExpandedDetailsView, indexOfChild(mUpperHeaderView) + 1);
+ mExtraContentView.addView(mExpandedDetailsView, 0);
}
mExpandedDetailsView.setVisibility(VISIBLE);
}