am 36fda2ba: Merge "[IL96] Inline a method"

* commit '36fda2bae38a8bf6b07c449f63af817cdde72de5':
  [IL96] Inline a method
main
Jean Chalard 2014-01-27 23:34:54 -08:00 committed by Android Git Automerger
commit a2129ea38b
1 changed files with 1 additions and 5 deletions

View File

@ -1033,10 +1033,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
}
private void setSuggestionStripShown(final boolean shown) {
setSuggestionStripShownInternal(shown, /* needsInputViewShown */true);
}
private int getAdjustedBackingViewHeight() {
final int currentHeight = mKeyPreviewBackingView.getHeight();
if (currentHeight > 0) {
@ -1347,7 +1343,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// the practice.
mInputLogic.mConnection.setComposingText(textWithUnderline, 1);
}
setSuggestionStripShown(shouldShow);
setSuggestionStripShownInternal(shouldShow, true /* needsInputViewShown */);
}
// TODO[IL]: Move this out of LatinIME.