Merge "Remove useless args and processing." (4423f3da) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -340,10 +340,6 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		mState.onCodeInput(code, mLatinIME.getCurrentAutoCapsState());
		}

		private boolean isShowingMainKeyboard() {
		return null != mKeyboardView && mKeyboardView.isShown();
		}

		public boolean isShowingEmojiPalettes() {
		return mEmojiPalettesView != null && mEmojiPalettesView.isShown();
		}
		@@ -376,10 +372,6 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		}
		}

		public boolean isShowingMainKeyboardOrEmojiPalettes() {
		return isShowingMainKeyboard() \|\| isShowingEmojiPalettes();
		}

		public View onCreateInputView(final boolean isHardwareAcceleratedDrawingEnabled) {
		if (mKeyboardView != null) {
		mKeyboardView.closing();

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

+10 −16

Original line number	Diff line number	Diff line
		@@ -853,7 +853,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		}
		// This will set the punctuation suggestions if next word suggestion is off;
		// otherwise it will clear the suggestion strip.
		setNeutralSuggestionStripInternal(false /* needsInputViewShown */);
		setNeutralSuggestionStripInternal();

		mHandler.cancelUpdateSuggestionStrip();
		mHandler.cancelDoubleSpacePeriodTimer();
		@@ -1018,23 +1018,18 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		null /* rawSuggestions /, false / typedWordValid /, false / willAutoCorrect */,
		false /* isObsoleteSuggestions /, false / isPrediction */);
		// When in fullscreen mode, show completions generated by the application forcibly
		setSuggestedWords(suggestedWords, true /* isSuggestionStripVisible */,
		true /* needsInputViewShown */);
		setSuggestedWords(suggestedWords, true /* isSuggestionStripVisible */);
		if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
		ResearchLogger.latinIME_onDisplayCompletions(applicationSpecifiedCompletions);
		}
		}

		private void setSuggestionStripShownInternal(final boolean isSuggestionStripVisible,
		final boolean needsInputViewShown) {
		private void setSuggestionStripShownInternal(final boolean isSuggestionStripVisible) {
		// TODO: Modify this if we support suggestions with hard keyboard
		if (!onEvaluateInputViewShown() \|\| !hasSuggestionStripView()) {
		return;
		}
		final boolean inputViewShown = mKeyboardSwitcher.isShowingMainKeyboardOrEmojiPalettes();
		final boolean shouldShowSuggestions = isSuggestionStripVisible
		&& (needsInputViewShown ? inputViewShown : true);
		if (shouldShowSuggestions) {
		if (isSuggestionStripVisible) {
		mSuggestionStripView.setVisibility(View.VISIBLE);
		} else {
		mSuggestionStripView.setVisibility(isFullscreenMode() ? View.GONE : View.INVISIBLE);
		@@ -1366,7 +1361,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen

		// TODO[IL]: Define a clear interface for this
		public void setSuggestedWords(final SuggestedWords suggestedWords,
		final boolean isSuggestionStripVisible, final boolean needsInputViewShown) {
		final boolean isSuggestionStripVisible) {
		mInputLogic.setSuggestedWords(suggestedWords);
		if (!hasSuggestionStripView()) {
		return;
		@@ -1386,7 +1381,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		SubtypeLocaleUtils.isRtlLanguage(mSubtypeSwitcher.getCurrentSubtype()));
		}
		mKeyboardSwitcher.onAutoCorrectionStateChanged(suggestedWords.mWillAutoCorrect);
		setSuggestionStripShownInternal(isSuggestionStripVisible, needsInputViewShown);
		setSuggestionStripShownInternal(isSuggestionStripVisible);
		}

		// TODO[IL]: Move this out of LatinIME.
		@@ -1472,8 +1467,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		setNeutralSuggestionStrip();
		} else {
		mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
		setSuggestedWords(
		suggestedWords, isSuggestionStripVisible(), true /* needsInputViewShown */);
		setSuggestedWords(suggestedWords, isSuggestionStripVisible());
		}
		// Cache the auto-correction in accessibility code so we can speak it if the user
		// touches a key that will insert it.
		@@ -1502,14 +1496,14 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		// punctuation suggestions (if it's disabled).
		@Override
		public void setNeutralSuggestionStrip() {
		setNeutralSuggestionStripInternal(true /* needsInputViewShown */);
		setNeutralSuggestionStripInternal();
		}

		private void setNeutralSuggestionStripInternal(final boolean needsInputViewShown) {
		private void setNeutralSuggestionStripInternal() {
		final SettingsValues currentSettings = mSettings.getCurrent();
		final SuggestedWords neutralSuggestions = currentSettings.mBigramPredictionEnabled
		? SuggestedWords.EMPTY : currentSettings.mSpacingAndPunctuations.mSuggestPuncList;
		setSuggestedWords(neutralSuggestions, isSuggestionStripVisible(), needsInputViewShown);
		setSuggestedWords(neutralSuggestions, isSuggestionStripVisible());
		}

		// TODO: Make this private