am 852b589a: am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1 (b9fc0a4d) · Commits · e / os / android_frameworks_base

services/java/com/android/server/InputMethodManagerService.java

+17 −10

Original line number	Diff line number	Diff line
		@@ -382,6 +382,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		public void onReceive(Context context, Intent intent) {
		if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) {
		mScreenOn = true;
		refreshImeWindowVisibilityLocked();
		} else if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) {
		mScreenOn = false;
		setImeWindowVisibilityStatusHiddenLocked();
		@@ -640,6 +641,21 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		updateImeWindowStatusLocked();
		}

		private void refreshImeWindowVisibilityLocked() {
		final Configuration conf = mRes.getConfiguration();
		final boolean haveHardKeyboard = conf.keyboard
		!= Configuration.KEYBOARD_NOKEYS;
		final boolean hardKeyShown = haveHardKeyboard
		&& conf.hardKeyboardHidden
		!= Configuration.HARDKEYBOARDHIDDEN_YES;
		final boolean isScreenLocked = mKeyguardManager != null
		&& mKeyguardManager.isKeyguardLocked()
		&& mKeyguardManager.isKeyguardSecure();
		mImeWindowVis = (!isScreenLocked && (mInputShown \|\| hardKeyShown)) ?
		(InputMethodService.IME_ACTIVE \| InputMethodService.IME_VISIBLE) : 0;
		updateImeWindowStatusLocked();
		}

		private void updateImeWindowStatusLocked() {
		setImeWindowStatus(mCurToken, mImeWindowVis, mBackDisposition);
		}
		@@ -1285,16 +1301,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		}
		if (mCurMethod != null) {
		try {
		final Configuration conf = mRes.getConfiguration();
		final boolean haveHardKeyboard = conf.keyboard
		!= Configuration.KEYBOARD_NOKEYS;
		final boolean hardKeyShown = haveHardKeyboard
		&& conf.hardKeyboardHidden
		!= Configuration.HARDKEYBOARDHIDDEN_YES;
		mImeWindowVis = (mInputShown \|\| hardKeyShown) ? (
		InputMethodService.IME_ACTIVE \| InputMethodService.IME_VISIBLE)
		: 0;
		updateImeWindowStatusLocked();
		refreshImeWindowVisibilityLocked();
		// If subtype is null, try to find the most applicable one from
		// getCurrentInputMethodSubtype.
		if (subtype == null) {