Update Spam Warning View.
Change-Id: I13632cda3b3feecc144ab313d2d2254419af9a98
diff --git a/res/layout/conversation_message_spam_warning.xml b/res/layout/conversation_message_spam_warning.xml
index 8851b9f..545df09 100644
--- a/res/layout/conversation_message_spam_warning.xml
+++ b/res/layout/conversation_message_spam_warning.xml
@@ -19,7 +19,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/spam_warning"
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/spam_warning_view_list_padding"
+ android:layout_marginRight="@dimen/spam_warning_view_list_padding" >
<ImageView
android:id="@+id/spam_warning_icon"
@@ -58,8 +60,7 @@
<View
android:id="@+id/spam_warning_bottom_border"
android:layout_width="match_parent"
- android:layout_height="@dimen/message_border_height"
- android:layout_alignParentBottom="true"
- android:background="@color/conversation_view_border_color" />
+ android:layout_height="10dp"
+ android:layout_alignParentBottom="true" />
</com.android.mail.browse.SpamWarningView>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c44fd3a..1927f9b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -77,7 +77,11 @@
<!-- Color of the parent folders and dividers for hierarchical folder descriptions in the move to folder -->
<color name="hierarchical_folder_parent_color">@color/gray_text_color</color>
- <color name="high_spam_color">#CC0000</color>
+ <!-- Spam warning text and background colors -->
+ <color name="high_spam_color">@android:color/white</color>
+ <color name="high_spam_warning_background_color">#CC0000</color>
+ <color name="low_spam_color">#CC0000</color>
+ <color name="low_spam_warning_background_color">#ebebeb</color>
<color name="notification_template_icon_low_bg">#0cffffff</color>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 9a592c2..6ecd708 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -198,4 +198,6 @@
<dimen name="teaser_arrow_margin_start">16dip</dimen>
<dimen name="teaser_arrow_margin_end">12dip</dimen>
+
+ <dimen name="spam_warning_view_list_padding">16dip</dimen>
</resources>
diff --git a/src/com/android/mail/browse/SpamWarningView.java b/src/com/android/mail/browse/SpamWarningView.java
index 598d109..b86ba82 100644
--- a/src/com/android/mail/browse/SpamWarningView.java
+++ b/src/com/android/mail/browse/SpamWarningView.java
@@ -20,6 +20,8 @@
private TextView mSpamWarningLink;
private final int mHighWarningColor;
private final int mLowWarningColor;
+ private final int mHighWarningBackgroundColor;
+ private final int mLowWarningBackgroundColor;
public SpamWarningView(Context context) {
this(context, null);
@@ -27,9 +29,12 @@
public SpamWarningView(Context context, AttributeSet attrs) {
super(context, attrs);
-
mHighWarningColor = getResources().getColor(R.color.high_spam_color);
- mLowWarningColor = getResources().getColor(R.color.conv_header_text_light);
+ mHighWarningBackgroundColor = getResources().getColor(
+ R.color.high_spam_warning_background_color);
+ mLowWarningColor = getResources().getColor(R.color.low_spam_color);
+ mLowWarningBackgroundColor = getResources().getColor(
+ R.color.low_spam_warning_background_color);
}
@Override
@@ -66,11 +71,13 @@
message.spamWarningString, senderAddress, senderDomain)));
if (message.spamWarningLevel == UIProvider.SpamWarningLevel.HIGH_WARNING) {
+ setBackgroundColor(mHighWarningBackgroundColor);
mSpamWarningText.setTextColor(mHighWarningColor);
- mSpamWarningIcon.setImageResource(R.drawable.ic_alert_red);
- } else {
- mSpamWarningText.setTextColor(mLowWarningColor);
mSpamWarningIcon.setImageResource(R.drawable.ic_alert_grey);
+ } else {
+ setBackgroundColor(mLowWarningBackgroundColor);
+ mSpamWarningText.setTextColor(mLowWarningColor);
+ mSpamWarningIcon.setImageResource(R.drawable.ic_alert_red);
}
// Sets the link to the appropriate text
