diff options
| author | Ben Murdoch <benm@google.com> | 2014-02-28 14:44:34 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-02-28 15:19:21 +0000 |
| commit | 3b1632a210328fc8e924bb40316d793502206a37 (patch) | |
| tree | 01ed933208a7352cf89db2822d2eb74b7bec4617 | |
| parent | 7609f0f74a1b93ae5964d1d31a51fd25cca5d72b (diff) | |
| download | android_packages_apps_HTMLViewer-3b1632a210328fc8e924bb40316d793502206a37.tar.gz android_packages_apps_HTMLViewer-3b1632a210328fc8e924bb40316d793502206a37.tar.bz2 android_packages_apps_HTMLViewer-3b1632a210328fc8e924bb40316d793502206a37.zip | |
HTMLViewer: allow encoding to be specified in incoming Intent.
Bug:13214875
Change-Id: I7eb9857e9f6d3f640c6264da98681d065e22527f
| -rw-r--r-- | src/com/android/htmlviewer/HTMLViewerActivity.java | 8 |
1 files changed, 8 insertions, 0 deletions
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); } } |