resolved conflicts for merge of be82f297 to master (a19c5e63) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -1627,7 +1627,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		}

		public boolean isSuggestionsRequested() {
		// TODO: move this method to mSettingsValues
		// TODO: move this method to mCurrentSettings
		return (null != mInputAttributes && mInputAttributes.mIsSettingsSuggestionStripOn)
		&& (mCurrentSettings.isCorrectionOn() \|\| isShowingSuggestionsStrip());
		}
		@@ -1953,12 +1953,16 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		// showSuggestions will retrieve the word near the cursor, we don't want that here)
		showSuggestions(suggestedWords, "");
		} else {
		if (!isShowingPunctuationList()) setPunctuationSuggestions();
		clearSuggestions();
		}
		}

		public void setPunctuationSuggestions() {
		if (mCurrentSettings.mBigramPredictionEnabled) {
		clearSuggestions();
		} else {
		setSuggestions(mCurrentSettings.mSuggestPuncList, false);
		}
		setAutoCorrectionIndicator(false);
		setSuggestionStripShown(isSuggestionsStripVisible());
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -670,7 +670,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
		}

		public void setSuggestions(SuggestedWords suggestedWords) {
		if (suggestedWords == null \|\| suggestedWords.size() == 0)
		if (suggestedWords == null)
		return;

		clear();