diff options
| author | Seigo Nonaka <nona@google.com> | 2015-05-06 20:31:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 20:31:19 +0000 |
| commit | 06bdf9c6a6e2a23f18129cf390c6277085210dd1 (patch) | |
| tree | 886ba9a559c8fb3ac71bd0e42375f04b2a201d5f /packages/Keyguard | |
| parent | a1d3c508e160b35f4f8ef56c2fb2fd6f65d5cbbd (diff) | |
| parent | 80ff4ed6bb8dbdad7192d679a01096aa888e090b (diff) | |
| download | frameworks_base-06bdf9c6a6e2a23f18129cf390c6277085210dd1.zip frameworks_base-06bdf9c6a6e2a23f18129cf390c6277085210dd1.tar.gz frameworks_base-06bdf9c6a6e2a23f18129cf390c6277085210dd1.tar.bz2 | |
Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java index 845d53a..929258d 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java @@ -162,7 +162,8 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView switchImeButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { mCallback.userActivity(); // Leave the screen on a bit longer - mImm.showInputMethodPicker(); + // Do not show auxiliary subtypes in password lock screen. + mImm.showInputMethodPicker(false /* showAuxiliarySubtypes */); } }); } |