Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not show auxiliary subtypes on the lock screen

Browse Source 
Change-Id: Id7cf5d122968790ba6d75d3b047d45ea99e4d0f6
This commit is contained in:
satok
2011-08-26 16:22:22 +09:00
parent fbedf1a397
commit bc81b692d5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -2018,8 +2018,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (DEBUG) Slog.v(TAG, "Show switching menu"); if (DEBUG) Slog.v(TAG, "Show switching menu");
final Context context = mContext; final Context context = mContext;
final PackageManager pm = context.getPackageManager(); final PackageManager pm = context.getPackageManager();
final boolean isScreenLocked = mKeyguardManager != null
&& mKeyguardManager.isKeyguardLocked() && mKeyguardManager.isKeyguardSecure();
String lastInputMethodId = Settings.Secure.getString(context String lastInputMethodId = Settings.Secure.getString(context
.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD); .getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
@@ -2075,7 +2076,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
final String subtypeHashCode = String.valueOf(subtype.hashCode()); final String subtypeHashCode = String.valueOf(subtype.hashCode());
// We show all enabled IMEs and subtypes when an IME is shown. // We show all enabled IMEs and subtypes when an IME is shown.
if (enabledSubtypeSet.contains(subtypeHashCode) if (enabledSubtypeSet.contains(subtypeHashCode)
&& (mInputShown || !subtype.isAuxiliary())) { && ((mInputShown && !isScreenLocked) || !subtype.isAuxiliary())) {
final CharSequence title; final CharSequence title;
final String mode = subtype.getMode(); final String mode = subtype.getMode();
title = TextUtils.concat(subtype.getDisplayName(context, title = TextUtils.concat(subtype.getDisplayName(context,
@@ -2162,8 +2163,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
} }
}); });
if (showSubtypes && mKeyguardManager != null && !(mKeyguardManager.isKeyguardLocked() if (showSubtypes && !isScreenLocked) {
&& mKeyguardManager.isKeyguardSecure())) {
mDialogBuilder.setPositiveButton( mDialogBuilder.setPositiveButton(
com.android.internal.R.string.configure_input_methods, com.android.internal.R.string.configure_input_methods,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {