Merge "Respect the "Make password visible" setting."
diff --git a/core/java/android/webkit/WebSettingsClassic.java b/core/java/android/webkit/WebSettingsClassic.java
index 354bb5a..1288613 100644
--- a/core/java/android/webkit/WebSettingsClassic.java
+++ b/core/java/android/webkit/WebSettingsClassic.java
@@ -22,7 +22,8 @@
import android.os.Build;
import android.os.Handler;
import android.os.Message;
-import android.util.DisplayMetrics;
+import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
import android.util.EventLog;
import java.util.Locale;
@@ -122,6 +123,7 @@
private boolean mLoadWithOverviewMode = false;
private boolean mEnableSmoothTransition = false;
private boolean mForceUserScalable = false;
+ private boolean mPasswordEchoEnabled = true;
// AutoFill Profile data
public static class AutoFillProfile {
@@ -295,6 +297,13 @@
mAllowUniversalAccessFromFileURLs = 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";