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

Merge "Consolidate a test."

Browse source
This commit is contained in:
Jean Chalard 2012-06-12 11:50:36 -07:00 committed by Android (Google) Code Review
commit 58d9e46ce0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -391,6 +391,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
Utils.GCUtils.getInstance().reset(); Utils.GCUtils.getInstance().reset();
boolean tryGC = true; boolean tryGC = true;
// Shouldn't this be removed? I think that from Honeycomb on, the GC is now actually working
// as expected and this code is useless.
for (int i = 0; i < Utils.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) { for (int i = 0; i < Utils.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
try { try {
initSuggest(); initSuggest();
@ -762,6 +764,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
composingSpanEnd, mExpectingUpdateSelection, composingSpanEnd, mExpectingUpdateSelection,
expectingUpdateSelectionFromLogger, mConnection); expectingUpdateSelectionFromLogger, mConnection);
if (expectingUpdateSelectionFromLogger) { if (expectingUpdateSelectionFromLogger) {
// TODO: Investigate. Quitting now sounds wrong - we won't do the resetting work
return; return;
} }
} }
@ -1626,7 +1629,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
public boolean isSuggestionsRequested() { public boolean isSuggestionsRequested() {
// TODO: move this method to mSettingsValues // TODO: move this method to mSettingsValues
return mInputAttributes.mIsSettingsSuggestionStripOn return mInputAttributes.mIsSettingsSuggestionStripOn
&& (mCurrentSettings.mCorrectionMode > 0 || isShowingSuggestionsStrip()); && (mCurrentSettings.isCorrectionOn() || isShowingSuggestionsStrip());
} }
public boolean isShowingPunctuationList() { public boolean isShowingPunctuationList() {