diff options
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 3 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index db8fc6fb04ad..7cf3cb5ad7ca 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -1355,9 +1355,10 @@ public abstract class WebSettings { public synchronized boolean getJavaScriptCanOpenWindowsAutomatically() { throw new MustOverrideException(); } + /** * Sets the default text encoding name to use when decoding html pages. - * The default is "Latin-1". + * The default is "UTF-8". * * @param encoding the text encoding name */ diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index b45237bce1ed..a0ac3af65eb9 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1779,9 +1779,6 @@ <string-array translatable="false" name="config_cdma_home_system" /> - <!-- Default text encoding for WebSettings. @hide @SystemApi --> - <string name="config_webSettingsDefaultTextEncoding">UTF-8</string> - <!--From SmsMessage--> <!--Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet string that's stored in 8-bit unpacked format) characters.--> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 8ebcd6d27130..7568252d912b 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2545,8 +2545,6 @@ <!-- @hide This really shouldn't be public; clients using it should use @* to ref it. --> <public type="style" name="Theme.Leanback.FormWizard" id="0x010302d0" /> - <public type="string" name="config_webSettingsDefaultTextEncoding" id="0x01040018" /> - <public type="array" name="config_keySystemUuidMapping" id="0x01070005" /> <!-- An interpolator which accelerates fast but decelerates slowly. --> |