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

2018-04-09 23:30:35 +00:00
parent 0c92430be4 670a3e582f
commit b410c21a01
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);
        }
    }