am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden

* commit 'dccad3efa4af41282857df5140e8ca6dc9ad99be':
  Fix isSuggestionsStripVisible when keyboard hidden
main
Jean Chalard 2013-05-15 12:59:05 -07:00 committed by Android Git Automerger
commit 95586abc11
1 changed files with 14 additions and 5 deletions

View File

@ -2102,16 +2102,25 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
private boolean isSuggestionsStripVisible() {
if (mSuggestionStripView == null)
final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
if (null == mainKeyboardView || !mainKeyboardView.isShown()) {
return false;
if (mSuggestionStripView.isShowingAddToDictionaryHint())
}
if (mSuggestionStripView == null) {
return false;
}
if (mSuggestionStripView.isShowingAddToDictionaryHint()) {
return true;
if (null == mSettings.getCurrent())
}
if (null == mSettings.getCurrent()) {
return false;
if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation))
}
if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation)) {
return false;
if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn())
}
if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) {
return true;
}
return mSettings.getCurrent().isSuggestionsRequested(mDisplayOrientation);
}