Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43751757 authored by Marcin Kosiba's avatar Marcin Kosiba Committed by Android (Google) Code Review
Browse files

Merge "Remove the default WebView text encoding resource entirely." into lmp-dev

parents 7e522af6 fd1ac83f

core/java/android/webkit/WebSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -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

     */

core/res/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -1776,9 +1776,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.-->

core/res/res/values/public.xml

+0 −2
Original line number Diff line number Diff line
@@ -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. -->