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

Commit 0777558f authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Respect the "Make password visible" setting." into jb-dev

parents 68a808bc 89654a8f

core/java/android/webkit/WebSettingsClassic.java

+10 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,8 @@ import android.content.pm.PackageManager; 
import android.os.Build;

import android.os.Build;

import android.os.Handler;

import android.os.Handler;

import android.os.Message;

import android.os.Message;

import android.util.DisplayMetrics;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.util.EventLog;

import android.util.EventLog;





import java.util.Locale;

import java.util.Locale;
@@ -122,6 +123,7 @@ public class WebSettingsClassic extends WebSettings { 
    private boolean         mLoadWithOverviewMode = false;

    private boolean         mLoadWithOverviewMode = false;

    private boolean         mEnableSmoothTransition = false;

    private boolean         mEnableSmoothTransition = false;

    private boolean         mForceUserScalable = false;

    private boolean         mForceUserScalable = false;

    private boolean         mPasswordEchoEnabled = true;





    // AutoFill Profile data

    // AutoFill Profile data

    public static class AutoFillProfile {

    public static class AutoFillProfile {
@@ -295,6 +297,13 @@ public class WebSettingsClassic extends WebSettings { 
            mAllowUniversalAccessFromFileURLs = true;

            mAllowUniversalAccessFromFileURLs = true;

            mAllowFileAccessFromFileURLs = true;

            mAllowFileAccessFromFileURLs = true;

        }

        }

        try {

            mPasswordEchoEnabled =

                    Settings.System.getInt(context.getContentResolver(),

                        Settings.System.TEXT_SHOW_PASSWORD) != 0;

        } catch (SettingNotFoundException e) {

            mPasswordEchoEnabled = true;

        }

    }

    }





    private static final String ACCEPT_LANG_FOR_US_LOCALE = "en-US";

    private static final String ACCEPT_LANG_FOR_US_LOCALE = "en-US";