am 96d31df8: Fix when to show input view (3e724591) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -254,8 +254,9 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		}

		public void onToggleEmojiKeyboard() {
		if (mKeyboardLayoutSet == null \|\| !isShowingEmojiPalettes()) {
		mLatinIME.startShowingInputView();
		final boolean needsToLoadKeyboard = (mKeyboardLayoutSet == null);
		if (needsToLoadKeyboard \|\| !isShowingEmojiPalettes()) {
		mLatinIME.startShowingInputView(needsToLoadKeyboard);
		setEmojiKeyboard();
		} else {
		mLatinIME.stopShowingInputView();

java/src/com/android/inputmethod/latin/LatinIME.java

+24 −4

Original line number	Diff line number	Diff line
		@@ -733,6 +733,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		public void setInputView(final View view) {
		super.setInputView(view);
		mInputView = view;
		updateSoftInputWindowLayoutParameters();
		mSuggestionStripView = (SuggestionStripView)view.findViewById(R.id.suggestion_strip_view);
		if (hasSuggestionStripView()) {
		mSuggestionStripView.setListener(this, view);
		@@ -1147,6 +1148,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		@Override
		public void onComputeInsets(final InputMethodService.Insets outInsets) {
		super.onComputeInsets(outInsets);
		// This method may be called before {@link #setInputView(View)}.
		if (mInputView == null) {
		return;
		}
		final SettingsValues settingsValues = mSettings.getCurrent();
		final View visibleKeyboardView = mKeyboardSwitcher.getVisibleKeyboardView();
		if (visibleKeyboardView == null \|\| !hasSuggestionStripView()) {
		@@ -1181,18 +1186,29 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		outInsets.visibleTopInsets = visibleTopY;
		}

		public void startShowingInputView() {
		public void startShowingInputView(final boolean needsToLoadKeyboard) {
		mIsExecutingStartShowingInputView = true;
		// This {@link #showWindow(boolean)} will eventually call back
		// {@link #onEvaluateInputViewShown()}.
		showWindow(true /* showInput */);
		mIsExecutingStartShowingInputView = false;
		if (needsToLoadKeyboard) {
		loadKeyboard();
		}
		}

		public void stopShowingInputView() {
		showWindow(false /* showInput */);
		}

		@Override
		public boolean onShowInputRequested(final int flags, final boolean configChange) {
		if (Settings.getInstance().getCurrent().mHasHardwareKeyboard) {
		return true;
		}
		return super.onShowInputRequested(flags, configChange);
		}

		@Override
		public boolean onEvaluateInputViewShown() {
		if (mIsExecutingStartShowingInputView) {
		@@ -1223,8 +1239,14 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen

		@Override
		public void updateFullscreenMode() {
		super.updateFullscreenMode();
		mInputLogic.onUpdateFullscreenMode(isFullscreenMode());
		updateSoftInputWindowLayoutParameters();
		}

		private void updateSoftInputWindowLayoutParameters() {
		// Override layout parameters to expand {@link SoftInputWindow} to the entire screen.
		// See {@link InputMethodService#setinputView(View) and
		// See {@link InputMethodService#setinputView(View)} and
		// {@link SoftInputWindow#updateWidthHeight(WindowManager.LayoutParams)}.
		final Window window = getWindow().getWindow();
		ViewLayoutUtils.updateLayoutHeightOf(window, LayoutParams.MATCH_PARENT);
		@@ -1243,8 +1265,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		ViewLayoutUtils.updateLayoutGravityOf(inputArea, Gravity.BOTTOM);
		ViewLayoutUtils.updateLayoutHeightOf(mInputView, layoutHeight);
		}
		super.updateFullscreenMode();
		mInputLogic.onUpdateFullscreenMode(isFullscreenMode());
		}

		private int getCurrentAutoCapsState() {