From 3b1632a210328fc8e924bb40316d793502206a37 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 28 Feb 2014 14:44:34 +0000
Subject: HTMLViewer: allow encoding to be specified in incoming Intent.

Bug:13214875

Change-Id: I7eb9857e9f6d3f640c6264da98681d065e22527f
---
 src/com/android/htmlviewer/HTMLViewerActivity.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/com/android/htmlviewer/HTMLViewerActivity.java b/src/com/android/htmlviewer/HTMLViewerActivity.java
index e51e7a1..f51d68b 100644
--- a/src/com/android/htmlviewer/HTMLViewerActivity.java
+++ b/src/com/android/htmlviewer/HTMLViewerActivity.java
@@ -46,6 +46,9 @@ import java.io.InputStream;
  */
 public class HTMLViewerActivity extends Activity {
 
+    // TODO: Make public on android.content.Intent.
+    private static final String EXTRA_TEXT_ENCODING = "android.intent.extra.TEXT_ENCODING";
+
     /*
      * The WebView that is placed in this Activity
      */
@@ -103,6 +106,11 @@ public class HTMLViewerActivity extends Activity {
                 String contentUri = "file".equals(uri.getScheme())
                         ? FileContentProvider.BASE_URI + uri.getEncodedPath()
                         : uri.toString();
+                String encoding = intent.getStringExtra(EXTRA_TEXT_ENCODING);
+                if (encoding != null) {
+                    Log.i(LOGTAG, "Intent is forcing text encoding to: " + encoding);
+                    s.setDefaultTextEncodingName(encoding);
+                }
                 mWebView.loadUrl(contentUri);
             }
         }
-- 
cgit v1.2.3