summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-03-17 17:27:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-17 17:27:04 +0000
commit70f07acf98cfe9d150ea245be6ccb4731126e4fb (patch)
tree08526af234efc223d319afe89c37ab9b5ef46e0e
parent884e3b4d2e0d535c006ac5d1f702cca98cdc746e (diff)
parent0fa2c6a68e34bcff5c1dccc564e210273de7af6d (diff)
downloadandroid_packages_apps_HTMLViewer-70f07acf98cfe9d150ea245be6ccb4731126e4fb.tar.gz
android_packages_apps_HTMLViewer-70f07acf98cfe9d150ea245be6ccb4731126e4fb.tar.bz2
android_packages_apps_HTMLViewer-70f07acf98cfe9d150ea245be6ccb4731126e4fb.zip
Merge "Revert "HTMLViewer: allow encoding to be specified in incoming Intent.""
-rw-r--r--src/com/android/htmlviewer/HTMLViewerActivity.java8
1 files changed, 0 insertions, 8 deletions
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 @@ 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
*/
@@ -106,11 +103,6 @@ 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);
}
}