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

Commit c27d9b53 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.

parent 9399695a

core/java/android/webkit/WebSettings.java

+3 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class WebSettings { 
    private String          mSerifFontFamily = "serif";

    private String          mCursiveFontFamily = "cursive";

    private String          mFantasyFontFamily = "fantasy";

    private String          mDefaultTextEncoding = "Latin-1";

    private String          mDefaultTextEncoding;

    private String          mUserAgent;

    private boolean         mUseDefaultUserAgent;

    private String          mAcceptLanguage;
@@ -240,6 +240,8 @@ public class WebSettings { 
    WebSettings(Context context) {   

        mEventHandler = new EventHandler();

        mContext = context;

        mDefaultTextEncoding = context.getString(com.android.internal.

                                                 R.string.default_text_encoding);



        if (sLockForLocaleSettings == null) {

            sLockForLocaleSettings = new Object();