Merge "Add strings for hierarchical folders" into jb-ub-mail-ur10
diff --git a/res/raw/template_conversation_upper.html b/res/raw/template_conversation_upper.html
index 5ba3a84..fb69324 100644
--- a/res/raw/template_conversation_upper.html
+++ b/res/raw/template_conversation_upper.html
@@ -55,6 +55,7 @@
-webkit-transform: translate3d(0, 0, 0);
}
}
+ %s
</style>
</head>
<body style="margin: 0 %spx;">
diff --git a/src/com/android/mail/ui/HtmlConversationTemplates.java b/src/com/android/mail/ui/HtmlConversationTemplates.java
index a285247..d368454 100644
--- a/src/com/android/mail/ui/HtmlConversationTemplates.java
+++ b/src/com/android/mail/ui/HtmlConversationTemplates.java
@@ -23,6 +23,7 @@
import com.android.mail.R;
import com.android.mail.utils.LogTag;
import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
@@ -181,7 +182,9 @@
}
reset();
- append(sConversationUpper, sideMargin, conversationHeaderHeight);
+ final String border = Utils.isRunningKitkatOrLater() ?
+ "img[blocked-src] { border: 1px solid #CCCCCC; }" : "";
+ append(sConversationUpper, border, sideMargin, conversationHeaderHeight);
mInProgress = true;
}
diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index f3fd875..de21172 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -140,6 +140,11 @@
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
}
+ public static boolean isRunningKitkatOrLater() {
+ // TODO - change to SDK_INT check when API is finalized
+ return Build.VERSION.CODENAME.startsWith("K");
+ }
+
/**
* Sets WebView in a restricted mode suitable for email use.
*