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

am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden"" 

* commit '2e0fc8bf33411de82c8110878878ec1d6c392fe3':
  Revert "Fix isSuggestionsStripVisible when keyboard hidden"
main
Ken Wakasa 2013-05-15 12:59:09 -07:00 committed by Android Git Automerger
parent 8e7b173936 2e0fc8bf33
commit 5ee11c5d9a
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);
}