summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-02-19 18:18:14 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-19 18:18:14 -0800
commit93815e6038dd2609ab2587051ebd93c7bc2c3ab2 (patch)
treea4ef8c9de5d5fd7944a5f94cbc129435ce3724f7
parent75eca968cfecacf12b161250084893d20fb223d5 (diff)
parentc09f87802b03ccab41dd66cb229ceaf8ebbf2c1a (diff)
downloadbase-93815e6038dd2609ab2587051ebd93c7bc2c3ab2.tar.gz
Merge "Fix 2448345: Fix tactile feedback bug in password/PIN and pattern unlock."
-rw-r--r--phone/com/android/internal/policy/impl/PasswordUnlockScreen.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/phone/com/android/internal/policy/impl/PasswordUnlockScreen.java b/phone/com/android/internal/policy/impl/PasswordUnlockScreen.java
index 9094ed6..841c2e4 100644
--- a/phone/com/android/internal/policy/impl/PasswordUnlockScreen.java
+++ b/phone/com/android/internal/policy/impl/PasswordUnlockScreen.java
@@ -53,7 +53,6 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen
private LockPatternUtils mLockPatternUtils;
private PasswordEntryKeyboardView mKeyboardView;
private PasswordEntryKeyboardHelper mKeyboardHelper;
- private boolean mIsInPortrait;
// To avoid accidental lockout due to events while the device in in the pocket, ignore
// any passwords with length less than or equal to this length.
@@ -88,6 +87,9 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen
mKeyboardView.setVisibility(mCreatedWithKeyboardOpen ? View.INVISIBLE : View.VISIBLE);
mPasswordEntry.requestFocus();
+
+ mKeyboardHelper.setVibratePattern(mLockPatternUtils.isTactileFeedbackEnabled() ?
+ com.android.internal.R.array.config_virtualKeyVibePattern : 0);
}
@Override