Merge "Make it possible to have open tether network" into pi-dev am: b410c21a01

am: 0cbce4983f Change-Id: I59e11a84ab1dce03e7e9ab5afed816cb27313b1d
2018-04-09 19:27:48 -07:00
parent 679799dd1b 0cbce4983f
commit 58fc3deab2
8 changed files with 81 additions and 59 deletions
--- a/src/com/android/settings/widget/ValidatedEditTextPreference.java
+++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java
@@ -86,9 +86,14 @@ public class ValidatedEditTextPreference extends CustomEditTextPreference {
        super.onBindViewHolder(holder);

        final TextView textView = (TextView) holder.findViewById(android.R.id.summary);
-        if (textView != null && mIsSummaryPassword) {
+        if (textView == null) {
+            return;
+        }
+        if (mIsSummaryPassword) {
            textView.setInputType(
                    InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        } else {
+            textView.setInputType(InputType.TYPE_CLASS_TEXT);
        }
    }