Remove unused phrase gesture code. (4e0af436) · Commits · e / os / android_packages_inputmethods_LatinIME

common/src/com/android/inputmethod/latin/common/NativeSuggestOptions.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -43,10 +43,6 @@ public class NativeSuggestOptions {
		setBooleanOption(BLOCK_OFFENSIVE_WORDS, value);
		}

		public void setSpaceAwareGestureEnabled(final boolean value) {
		setBooleanOption(SPACE_AWARE_GESTURE_ENABLED, value);
		}

		public void setWeightForLocale(final float value) {
		// We're passing this option as a fixed point value, in thousands. This is decoded in
		// native code by SuggestOptions#weightForLocale().

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -292,8 +292,6 @@ public final class BinaryDictionary extends Dictionary {
		session.mNativeSuggestOptions.setIsGesture(isGesture);
		session.mNativeSuggestOptions.setBlockOffensiveWords(
		settingsValuesForSuggestion.mBlockPotentiallyOffensive);
		session.mNativeSuggestOptions.setSpaceAwareGestureEnabled(
		settingsValuesForSuggestion.mSpaceAwareGestureEnabled);
		session.mNativeSuggestOptions.setWeightForLocale(weightForLocale);
		if (inOutWeightOfLangModelVsSpatialModel != null) {
		session.mInputOutputWeightOfLangModelVsSpatialModel[0] =

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

+3 −46

Original line number	Diff line number	Diff line
		@@ -534,29 +534,6 @@ public final class InputLogic {
		final InputPointers batchPointers,
		// TODO: remove these arguments
		final KeyboardSwitcher keyboardSwitcher) {
		if (settingsValues.mPhraseGestureEnabled) {
		final SuggestedWordInfo candidate = mSuggestedWords.getAutoCommitCandidate();
		// If these suggested words have been generated with out of date input pointers, then
		// we skip auto-commit (see comments above on the mSequenceNumber member).
		if (null != candidate
		&& mSuggestedWords.mSequenceNumber >= mAutoCommitSequenceNumber) {
		if (candidate.mSourceDict.shouldAutoCommit(candidate)) {
		final String[] commitParts = candidate.mWord.split(Constants.WORD_SEPARATOR, 2);
		batchPointers.shift(candidate.mIndexOfTouchPointOfSecondWord);
		if (SpaceState.PHANTOM == mSpaceState) {
		insertAutomaticSpaceIfOptionsAndTextAllow(settingsValues);
		}
		mConnection.commitText(commitParts[0], 0);
		StatsUtils.onWordCommitUserTyped(commitParts[0], mWordComposer.isBatchMode());
		mSpaceState = SpaceState.PHANTOM;
		keyboardSwitcher.requestUpdatingShiftState(
		getCurrentAutoCapsState(settingsValues), getCurrentRecapitalizeState());
		mWordComposer.setCapitalizedModeAtStartComposingTime(getActualCapsMode(
		settingsValues, keyboardSwitcher.getKeyboardShiftMode()));
		++mAutoCommitSequenceNumber;
		}
		}
		}
		mInputLogicHandler.onUpdateBatchInput(batchPointers, mAutoCommitSequenceNumber);
		}

		@@ -1984,27 +1961,8 @@ public final class InputLogic {
		if (SpaceState.PHANTOM == mSpaceState) {
		insertAutomaticSpaceIfOptionsAndTextAllow(settingsValues);
		}
		final SuggestedWordInfo autoCommitCandidate = mSuggestedWords.getAutoCommitCandidate();
		// Commit except the last word for phrase gesture if the top suggestion is eligible for auto
		// commit.
		if (settingsValues.mPhraseGestureEnabled && null != autoCommitCandidate) {
		// Find the last space
		final int indexOfLastSpace = batchInputText.lastIndexOf(Constants.CODE_SPACE) + 1;
		if (0 != indexOfLastSpace) {
		mConnection.commitText(batchInputText.substring(0, indexOfLastSpace), 1);
		StatsUtils.onWordCommitUserTyped(
		batchInputText.substring(0, indexOfLastSpace), mWordComposer.isBatchMode());
		final SuggestedWords suggestedWordsForLastWordOfPhraseGesture =
		suggestedWords.getSuggestedWordsForLastWordOfPhraseGesture();
		mLatinIME.showSuggestionStrip(suggestedWordsForLastWordOfPhraseGesture);
		}
		final String lastWord = batchInputText.substring(indexOfLastSpace);
		mWordComposer.setBatchInputWord(lastWord);
		setComposingTextInternal(lastWord, 1);
		} else {
		mWordComposer.setBatchInputWord(batchInputText);
		setComposingTextInternal(batchInputText, 1);
		}
		mConnection.endBatchEdit();
		// Space state must be updated before calling updateShiftState
		mSpaceState = SpaceState.PHANTOM;
		@@ -2186,8 +2144,7 @@ public final class InputLogic {
		// hence 2; if we aren't, we should just skip whitespace if any, so 1.
		mWordComposer.isComposingWord() ? 2 : 1),
		keyboard,
		new SettingsValuesForSuggestion(settingsValues.mBlockPotentiallyOffensive,
		settingsValues.mPhraseGestureEnabled),
		new SettingsValuesForSuggestion(settingsValues.mBlockPotentiallyOffensive),
		settingsValues.mAutoCorrectionEnabledPerUserSettings,
		inputStyle, sequenceNumber, callback);
		}

java/src/com/android/inputmethod/latin/settings/Settings.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -90,7 +90,6 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
		public static final String PREF_GESTURE_PREVIEW_TRAIL = "pref_gesture_preview_trail";
		public static final String PREF_GESTURE_FLOATING_PREVIEW_TEXT =
		"pref_gesture_floating_preview_text";
		public static final String PREF_PHRASE_GESTURE_ENABLED = "pref_gesture_space_aware";

		public static final String PREF_KEY_IS_INTERNAL = "pref_key_is_internal";

		@@ -235,12 +234,6 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
		&& prefs.getBoolean(PREF_GESTURE_INPUT, true);
		}

		public static boolean readPhraseGestureEnabled(final SharedPreferences prefs,
		final Resources res) {
		return prefs.getBoolean(PREF_PHRASE_GESTURE_ENABLED,
		res.getBoolean(R.bool.config_default_phrase_gesture_enabled));
		}

		public static boolean readFromBuildConfigIfToShowKeyPreviewPopupOption(final Resources res) {
		return res.getBoolean(R.bool.config_enable_show_key_preview_popup_option);
		}

java/src/com/android/inputmethod/latin/settings/SettingsValues.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -77,7 +77,6 @@ public class SettingsValues {
		public final boolean mGestureTrailEnabled;
		public final boolean mGestureFloatingPreviewTextEnabled;
		public final boolean mSlidingKeyInputPreviewEnabled;
		public final boolean mPhraseGestureEnabled;
		public final int mKeyLongpressTimeout;
		public final boolean mEnableEmojiAltPhysicalKey;
		public final boolean mEnableMetricsLogging;
		@@ -174,7 +173,6 @@ public class SettingsValues {
		null /* default */);
		mGestureFloatingPreviewTextEnabled = !mInputAttributes.mDisableGestureFloatingPreviewText
		&& prefs.getBoolean(Settings.PREF_GESTURE_FLOATING_PREVIEW_TEXT, true);
		mPhraseGestureEnabled = Settings.readPhraseGestureEnabled(prefs, res);
		mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled
		&& !mInputAttributes.mInputTypeNoAutoCorrect;
		mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs);
		@@ -389,8 +387,6 @@ public class SettingsValues {
		sb.append("" + mGestureFloatingPreviewTextEnabled);
		sb.append("\n mSlidingKeyInputPreviewEnabled = ");
		sb.append("" + mSlidingKeyInputPreviewEnabled);
		sb.append("\n mPhraseGestureEnabled = ");
		sb.append("" + mPhraseGestureEnabled);
		sb.append("\n mKeyLongpressTimeout = ");
		sb.append("" + mKeyLongpressTimeout);
		sb.append("\n mLocale = ");