summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-02-09 16:41:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-09 16:41:32 +0000
commit92b2fe5d0d9781d57f3a2520eecc83682e9aa8ed (patch)
treea93814f77303f4553c886df5acc8f66f58b41fcc /packages/Keyguard
parent5acdb7c5372b578fcb2c752dc362bad37e32e703 (diff)
parentfc7e8f0b024ab119e7b06e5d3b6d5a1f4e00edba (diff)
downloadframeworks_base-92b2fe5d0d9781d57f3a2520eecc83682e9aa8ed.zip
frameworks_base-92b2fe5d0d9781d57f3a2520eecc83682e9aa8ed.tar.gz
frameworks_base-92b2fe5d0d9781d57f3a2520eecc83682e9aa8ed.tar.bz2
am 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing
automerge: fc7e8f0 * commit 'fc7e8f0b024ab119e7b06e5d3b6d5a1f4e00edba': Only request IME if password view is showing
Diffstat (limited to 'packages/Keyguard')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
index dfea166..845d53a 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
@@ -90,9 +90,11 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView
post(new Runnable() {
@Override
public void run() {
- mPasswordEntry.requestFocus();
- if (reason != KeyguardSecurityView.SCREEN_ON || mShowImeAtScreenOn) {
- mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
+ if (isShown()) {
+ mPasswordEntry.requestFocus();
+ if (reason != KeyguardSecurityView.SCREEN_ON || mShowImeAtScreenOn) {
+ mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
+ }
}
}
});