Merge "Hide password for wifi tether" into pi-dev am: 9bb2efa0ff

am: 1684f605f7

Change-Id: I8351f06cfdf8e505e1c00c78bfc3daaca15703b4

src/com/android/settings/widget/ValidatedEditTextPreference.java

@@ -19,6 +19,7 @@ package com.android.settings.widget;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.PreferenceViewHolder;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -27,6 +28,7 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.android.settingslib.CustomEditTextPreference;
 
@@ -42,6 +44,7 @@ public class ValidatedEditTextPreference extends CustomEditTextPreference {
     private final EditTextWatcher mTextWatcher = new EditTextWatcher();
     private Validator mValidator;
     private boolean mIsPassword;
+    private boolean mIsSummaryPassword;
 
     public ValidatedEditTextPreference(Context context, AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
@@ -78,10 +81,25 @@ public class ValidatedEditTextPreference extends CustomEditTextPreference {
         }
     }
 
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+
+        final TextView textView = (TextView) holder.findViewById(android.R.id.summary);
+        if (textView != null && mIsSummaryPassword) {
+            textView.setInputType(
+                    InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        }
+    }
+
     public void setIsPassword(boolean isPassword) {
         mIsPassword = isPassword;
     }
 
+    public void setIsSummaryPassword(boolean isPassword) {
+        mIsSummaryPassword = isPassword;
+    }
+
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     public boolean isPassword() {
         return mIsPassword;

src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java

@@ -51,6 +51,7 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
             Log.d(TAG, "Updating password in Preference, " + mPassword);
         }
         ((ValidatedEditTextPreference) mPreference).setValidator(this);
+        ((ValidatedEditTextPreference) mPreference).setIsSummaryPassword(true);
         updatePasswordDisplay((EditTextPreference) mPreference);
     }