commit 3b1632a210328fc8e924bb40316d793502206a37
author Ben Murdoch <benm@google.com> Fri Feb 28 14:44:34 2014 +0000
committer Ben Murdoch <benm@google.com> Fri Feb 28 15:19:21 2014 +0000
tree 01ed933208a7352cf89db2822d2eb74b7bec4617
parent 7609f0f74a1b93ae5964d1d31a51fd25cca5d72b

HTMLViewer: allow encoding to be specified in incoming Intent.

Bug:13214875

Change-Id: I7eb9857e9f6d3f640c6264da98681d065e22527f

src/com/android/htmlviewer/HTMLViewerActivity.java

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 @@
  */
 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 @@
                 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);
             }
         }