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

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
parent 8587e879b7 dccad3efa4
commit 95586abc11
1 changed files with 14 additions and 5 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

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