Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev (1b0888fe) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodManager.java

+1 −27

Original line number	Diff line number	Diff line
		@@ -247,13 +247,6 @@ public final class InputMethodManager {
		/** @hide */
		public static final int DISPATCH_HANDLED = 1;

		/** @hide */
		public static final int SHOW_IM_PICKER_MODE_AUTO = 0;
		/** @hide */
		public static final int SHOW_IM_PICKER_MODE_INCLUDE_AUXILIARY_SUBTYPES = 1;
		/** @hide */
		public static final int SHOW_IM_PICKER_MODE_EXCLUDE_AUXILIARY_SUBTYPES = 2;

		final IInputMethodManager mService;
		final Looper mMainLooper;

		@@ -1897,28 +1890,9 @@ public final class InputMethodManager {
		}
		}

		/**
		* Shows the input method chooser dialog.
		*
		* @param showAuxiliarySubtypes Set true to show auxiliary input methods.
		* @hide
		*/
		public void showInputMethodPicker(boolean showAuxiliarySubtypes) {
		synchronized (mH) {
		try {
		final int mode = showAuxiliarySubtypes ?
		SHOW_IM_PICKER_MODE_INCLUDE_AUXILIARY_SUBTYPES:
		SHOW_IM_PICKER_MODE_EXCLUDE_AUXILIARY_SUBTYPES;
		mService.showInputMethodPickerFromClient(mClient, mode);
		} catch (RemoteException e) {
		Log.w(TAG, "IME died: " + mCurId, e);
		}
		}
		}

		private void showInputMethodPickerLocked() {
		try {
		mService.showInputMethodPickerFromClient(mClient, SHOW_IM_PICKER_MODE_AUTO);
		mService.showInputMethodPickerFromClient(mClient);
		} catch (RemoteException e) {
		Log.w(TAG, "IME died: " + mCurId, e);
		}

core/java/com/android/internal/inputmethod/InputMethodSubtypeSwitchingController.java

+4 −10

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ public class InputMethodSubtypeSwitchingController {
		}

		public List<ImeSubtypeListItem> getSortedInputMethodAndSubtypeList(
		boolean showSubtypes, boolean includeAuxiliarySubtypes, boolean isScreenLocked) {
		boolean showSubtypes, boolean inputShown, boolean isScreenLocked) {
		final ArrayList<ImeSubtypeListItem> imList =
		new ArrayList<ImeSubtypeListItem>();
		final HashMap<InputMethodInfo, List<InputMethodSubtype>> immis =
		@@ -205,12 +205,6 @@ public class InputMethodSubtypeSwitchingController {
		if (immis == null \|\| immis.size() == 0) {
		return Collections.emptyList();
		}
		if (isScreenLocked && includeAuxiliarySubtypes) {
		if (DEBUG) {
		Slog.w(TAG, "Auxiliary subtypes are not allowed to be shown in lock screen.");
		}
		includeAuxiliarySubtypes = false;
		}
		mSortedImmis.clear();
		mSortedImmis.putAll(immis);
		for (InputMethodInfo imi : mSortedImmis.keySet()) {
		@@ -233,7 +227,7 @@ public class InputMethodSubtypeSwitchingController {
		final String subtypeHashCode = String.valueOf(subtype.hashCode());
		// We show all enabled IMEs and subtypes when an IME is shown.
		if (enabledSubtypeSet.contains(subtypeHashCode)
		&& (includeAuxiliarySubtypes \|\| !subtype.isAuxiliary())) {
		&& ((inputShown && !isScreenLocked) \|\| !subtype.isAuxiliary())) {
		final CharSequence subtypeLabel =
		subtype.overridesImplicitlyEnabledSubtype() ? null : subtype
		.getDisplayName(mContext, imi.getPackageName(),
		@@ -522,8 +516,8 @@ public class InputMethodSubtypeSwitchingController {
		}

		public List<ImeSubtypeListItem> getSortedInputMethodAndSubtypeListLocked(boolean showSubtypes,
		boolean includingAuxiliarySubtypes, boolean isScreenLocked) {
		boolean inputShown, boolean isScreenLocked) {
		return mSubtypeList.getSortedInputMethodAndSubtypeList(
		showSubtypes, includingAuxiliarySubtypes, isScreenLocked);
		showSubtypes, inputShown, isScreenLocked);
		}
		}

core/java/com/android/internal/view/IInputMethodManager.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -59,8 +59,7 @@ interface IInputMethodManager {
		int controlFlags, int softInputMode, int windowFlags,
		in EditorInfo attribute, IInputContext inputContext);

		void showInputMethodPickerFromClient(in IInputMethodClient client,
		int auxiliarySubtypeMode);
		void showInputMethodPickerFromClient(in IInputMethodClient client);
		void showInputMethodAndSubtypeEnablerFromClient(in IInputMethodClient client, String topId);
		void setInputMethod(in IBinder token, String id);
		void setInputMethodAndSubtype(in IBinder token, String id, in InputMethodSubtype subtype);

packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -162,8 +162,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView
		switchImeButton.setOnClickListener(new OnClickListener() {
		public void onClick(View v) {
		mCallback.userActivity(); // Leave the screen on a bit longer
		// Do not show auxiliary subtypes in password lock screen.
		mImm.showInputMethodPicker(false /* showAuxiliarySubtypes */);
		mImm.showInputMethodPicker();
		}
		});
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ public class NavigationBarView extends LinearLayout {
		@Override
		public void onClick(View view) {
		((InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE))
		.showInputMethodPicker(true /* showAuxiliarySubtypes */);
		.showInputMethodPicker();
		}
		};