am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
* commit 'd6d70e7325d9667e2780a150015802af232e997d': Revert "Fix isSuggestionsStripVisible when keyboard hidden"main
commit
2e0fc8bf33
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue