am 615e0576: am e924ecb6: Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1

* commit '615e05761c8ad30cfc5f827c020d6c5a79ed5c01':
  Fix 3510307: Hide PIN passwords in ConfirmLockPassword
This commit is contained in:
Jim Miller
2011-03-09 15:49:23 -08:00
committed by Android Git Automerger

View File

@@ -108,7 +108,7 @@ public class ConfirmLockPassword extends PreferenceActivity {
int currentType = mPasswordEntry.getInputType();
mPasswordEntry.setInputType(isAlpha ? currentType
: (currentType | InputType.TYPE_CLASS_NUMBER));
: (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
// Update the breadcrumb (title) if this is embedded in a PreferenceActivity
if (activity instanceof PreferenceActivity) {
@@ -138,10 +138,10 @@ public class ConfirmLockPassword extends PreferenceActivity {
private void handleNext() {
final String pin = mPasswordEntry.getText().toString();
if (mLockPatternUtils.checkPassword(pin)) {
Intent intent = new Intent();
intent.putExtra("password", pin);
getActivity().setResult(RESULT_OK, intent);
getActivity().finish();
} else {