From 3efa36f6aab4d3fd970f87a72805e647213105eb Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Tue, 14 May 2013 11:44:22 +0000
Subject: [PATCH] Revert "Fix isSuggestionsStripVisible when keyboard hidden"
This reverts commit cb0d1c4c584f3f47da3f630441b7de1e741584e0
Change-Id: Ie2c8e01c25bd051b6157e8f32ab84392a0c7252a
bug: 8954116
---
.../android/inputmethod/latin/LatinIME.java | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 5dd42bf022..fdd470cf1f 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2102,25 +2102,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);
}
--
GitLab