Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden"" (d6d70e73) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/LatinIME.java

+5 −14

Original line number	Diff line number	Diff line
		@@ -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()) {
		return false;
		}
		if (mSuggestionStripView == null) {
		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);
		}