Merge "Update preference to set password field" into pi-dev am: 13c45045de

am: 46ed260d0e Change-Id: I5cecf70da96f7b30659b341f3bdae65fb6b491d5
2018-04-17 16:35:51 -07:00
parent c7c81fa5d7 46ed260d0e
commit 19a17d0a6e
4 changed files with 20 additions and 2 deletions
--- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
@@ -116,7 +116,7 @@ public class ValidatedEditTextPreferenceTest {
        mPreference.onBindDialogView(mView);

        assertThat(editText.getInputType()
-                & (InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_CLASS_TEXT))
+                & (InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD | InputType.TYPE_CLASS_TEXT))
                .isNotEqualTo(0);
    }