Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46ed260d authored by Salvador Martinez's avatar Salvador Martinez Committed by android-build-merger
Browse files

Merge "Update preference to set password field" into pi-dev

am: 13c45045

Change-Id: I7c8f10af2c5b8514865eb83a49bede123f3403a3
parents 7a9b76f8 13c45045
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ public class ValidatedEditTextPreference extends CustomEditTextPreference {
            editText.removeTextChangedListener(mTextWatcher);
            editText.removeTextChangedListener(mTextWatcher);
            if (mIsPassword) {
            if (mIsPassword) {
                editText.setInputType(
                editText.setInputType(
                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
                editText.setMaxLines(1);
                editText.setMaxLines(1);
            }
            }
            editText.addTextChangedListener(mTextWatcher);
            editText.addTextChangedListener(mTextWatcher);
+1 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,7 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
            mPassword = generateRandomPassword();
            mPassword = generateRandomPassword();
        }
        }
        ((ValidatedEditTextPreference) mPreference).setValidator(this);
        ((ValidatedEditTextPreference) mPreference).setValidator(this);
        ((ValidatedEditTextPreference) mPreference).setIsPassword(true);
        ((ValidatedEditTextPreference) mPreference).setIsSummaryPassword(true);
        ((ValidatedEditTextPreference) mPreference).setIsSummaryPassword(true);
        updatePasswordDisplay((EditTextPreference) mPreference);
        updatePasswordDisplay((EditTextPreference) mPreference);
    }
    }
+1 −1
Original line number Original line Diff line number Diff line
@@ -116,7 +116,7 @@ public class ValidatedEditTextPreferenceTest {
        mPreference.onBindDialogView(mView);
        mPreference.onBindDialogView(mView);


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


+17 −0
Original line number Original line Diff line number Diff line
@@ -145,4 +145,21 @@ public class WifiTetherPasswordPreferenceControllerTest {
        assertThat(mController.getSecuritySettingForPassword())
        assertThat(mController.getSecuritySettingForPassword())
                .isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
                .isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
    }
    }

    @Test
    public void updateDisplay_shouldSetInputType() {
        // Set controller password to anything and verify is set.
        mController.displayPreference(mScreen);
        mController.onPreferenceChange(mPreference, "1");
        assertThat(mController.getPassword()).isEqualTo("1");

        // Create a new config using different password
        final WifiConfiguration config = new WifiConfiguration();
        config.preSharedKey = "test_1234";
        when(mWifiManager.getWifiApConfiguration()).thenReturn(config);

        // Call updateDisplay and verify it's changed.
        mController.updateDisplay();
        assertThat(mPreference.isPassword()).isTrue();
    }
}
}