diff options
| author | satok <satok@google.com> | 2011-08-26 16:22:22 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-08-26 16:22:22 +0900 |
| commit | bc81b692d51a9cd6f9d61584aacd8308ac3366ea (patch) | |
| tree | 684bb09ed79c435b89905c3b94cadc884ded251e /services/java/com/android/server/InputMethodManagerService.java | |
| parent | fbedf1a3978d5dfc4a886e4c7107d4bc1923f740 (diff) | |
Do not show auxiliary subtypes on the lock screen
Change-Id: Id7cf5d122968790ba6d75d3b047d45ea99e4d0f6
Diffstat (limited to 'services/java/com/android/server/InputMethodManagerService.java')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index c11755bea60f..38bcebc15053 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -2018,8 +2018,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (DEBUG) Slog.v(TAG, "Show switching menu"); final Context context = mContext; - final PackageManager pm = context.getPackageManager(); + final boolean isScreenLocked = mKeyguardManager != null + && mKeyguardManager.isKeyguardLocked() && mKeyguardManager.isKeyguardSecure(); String lastInputMethodId = Settings.Secure.getString(context .getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD); @@ -2075,7 +2076,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub final String subtypeHashCode = String.valueOf(subtype.hashCode()); // We show all enabled IMEs and subtypes when an IME is shown. if (enabledSubtypeSet.contains(subtypeHashCode) - && (mInputShown || !subtype.isAuxiliary())) { + && ((mInputShown && !isScreenLocked) || !subtype.isAuxiliary())) { final CharSequence title; final String mode = subtype.getMode(); title = TextUtils.concat(subtype.getDisplayName(context, @@ -2162,8 +2163,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } }); - if (showSubtypes && mKeyguardManager != null && !(mKeyguardManager.isKeyguardLocked() - && mKeyguardManager.isKeyguardSecure())) { + if (showSubtypes && !isScreenLocked) { mDialogBuilder.setPositiveButton( com.android.internal.R.string.configure_input_methods, new DialogInterface.OnClickListener() { |