commit 0fa2c6a68e34bcff5c1dccc564e210273de7af6d
author Ben Murdoch <benm@google.com> Mon Mar 17 17:24:57 2014 +0000
committer Ben Murdoch <benm@google.com> Mon Mar 17 17:24:57 2014 +0000
tree 08526af234efc223d319afe89c37ab9b5ef46e0e
parent 3b1632a210328fc8e924bb40316d793502206a37

Revert "HTMLViewer: allow encoding to be specified in incoming Intent."

We are going to unconditionally go for UTF-8 going forward.

This reverts commit 3b1632a210328fc8e924bb40316d793502206a37.

Change-Id: Ib8792c613c0d30b2097e125ea7c3bdaf6d737fd5

src/com/android/htmlviewer/HTMLViewerActivity.java

diff --git a/src/com/android/htmlviewer/HTMLViewerActivity.java b/src/com/android/htmlviewer/HTMLViewerActivity.java
index f51d68b..e51e7a1 100644
--- a/src/com/android/htmlviewer/HTMLViewerActivity.java
+++ b/src/com/android/htmlviewer/HTMLViewerActivity.java
@@ -46,9 +46,6 @@
  */
 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
      */
@@ -106,11 +103,6 @@
                 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);
             }
         }