nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of be82f297 to master 

Change-Id: If49ca384ea0ac415a75f8ea1bad77dc6719cb04d
main
Jean Chalard 2012-06-15 09:03:52 +09:00
parent 6b9b8e1620 be82f2974b
commit a19c5e6380
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -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() {
setSuggestions(mCurrentSettings.mSuggestPuncList, false);
if (mCurrentSettings.mBigramPredictionEnabled) {
clearSuggestions();
} else {
setSuggestions(mCurrentSettings.mSuggestPuncList, false);
}
setAutoCorrectionIndicator(false);
setSuggestionStripShown(isSuggestionsStripVisible());
}

2
java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
View File

@ -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();