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

Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""

Browse source
This commit is contained in:
Ken Wakasa 2013-05-14 11:46:04 +00:00 committed by Android (Google) Code Review
commit d6d70e7325
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2109,25 +2109,16 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
}
private boolean isSuggestionsStripVisible() {
final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
if (null == mainKeyboardView || !mainKeyboardView.isShown()) {
if (mSuggestionStripView == null)
return false;
}
if (mSuggestionStripView == null) {
return false;
}
if (mSuggestionStripView.isShowingAddToDictionaryHint()) {
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);
}