am dbcc9802: Use L API for WebView printing. Fixes b/14273163.
* commit 'dbcc98028f59244eacd9f127e6297aa98451f9b0':
Use L API for WebView printing. Fixes b/14273163.
diff --git a/src/com/android/mail/print/PrintUtils.java b/src/com/android/mail/print/PrintUtils.java
index ee04d9c..f9b4636 100644
--- a/src/com/android/mail/print/PrintUtils.java
+++ b/src/com/android/mail/print/PrintUtils.java
@@ -85,21 +85,22 @@
*
* Sets up a webview to perform the printing work.
*/
- @SuppressLint("NewApi")
+ @SuppressLint({"NewApi", "SetJavaScriptEnabled"})
private static void printHtml(Context context, String html,
String baseUri, String subject, boolean useJavascript) {
final WebView webView = new WebView(context);
final WebSettings settings = webView.getSettings();
settings.setBlockNetworkImage(false);
settings.setJavaScriptEnabled(useJavascript);
- webView.loadDataWithBaseURL(baseUri, html,
- "text/html", "utf-8", null);
+ webView.loadDataWithBaseURL(baseUri, html, "text/html", "utf-8", null);
final PrintManager printManager =
(PrintManager) context.getSystemService(Context.PRINT_SERVICE);
final String printJobName = buildPrintJobName(context, subject);
printManager.print(printJobName,
- webView.createPrintDocumentAdapter(),
+ Utils.isRunningLOrLater() ?
+ webView.createPrintDocumentAdapter(printJobName) :
+ webView.createPrintDocumentAdapter(),
new PrintAttributes.Builder().build());
}