Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 16c465b..3f4a4f3 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -108,7 +108,7 @@
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 @@
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 {