aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-06-15 15:52:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-15 15:52:14 -0700
commit6ebd93951f32720c5cb8f173381d8a4ac5ec7eab (patch)
tree3c5a42833d37e256a4dc9fa235c6eb13cf1d88b1 /java/src
parent32c465ec4d4ba4781e75b0f2fcf12b9cd2655be6 (diff)
parent3d44f489b321f7586af4af8f281550a45653f50a (diff)
downloadlatinime-6ebd93951f32720c5cb8f173381d8a4ac5ec7eab.tar.gz
latinime-6ebd93951f32720c5cb8f173381d8a4ac5ec7eab.tar.xz
latinime-6ebd93951f32720c5cb8f173381d8a4ac5ec7eab.zip
Merge "Inline a method for simplicity (B1)"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 77a0ccf70..b9f39c1e1 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1629,7 +1629,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
public boolean isSuggestionsRequested() {
// TODO: move this method to mCurrentSettings
return (null != mInputAttributes && mInputAttributes.mIsSettingsSuggestionStripOn)
- && (mCurrentSettings.isCorrectionOn() || isShowingSuggestionsStrip());
+ && (mCurrentSettings.isCorrectionOn()
+ || mCurrentSettings.isSuggestionStripVisibleInOrientation(mDisplayOrientation));
}
public boolean isShowingPunctuationList() {
@@ -1637,16 +1638,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
return mCurrentSettings.mSuggestPuncList == mSuggestionsView.getSuggestions();
}
- public boolean isShowingSuggestionsStrip() {
- return mCurrentSettings.isSuggestionStripVisibleInOrientation(mDisplayOrientation);
- }
-
public boolean isSuggestionsStripVisible() {
if (mSuggestionsView == null)
return false;
if (mSuggestionsView.isShowingAddToDictionaryHint())
return true;
- if (!isShowingSuggestionsStrip())
+ if (!mCurrentSettings.isSuggestionStripVisibleInOrientation(mDisplayOrientation))
return false;
if (null != mInputAttributes && mInputAttributes.mApplicationSpecifiedCompletionOn)
return true;