aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-03-03 23:48:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-03 23:48:49 -0800
commitf14bc5991e9577106a485fe9d2dc46a551256825 (patch)
tree8e52b175c06c7d7118e7e812413ff4ab84650c81 /java
parent4a3816383df4b27f7ec3487bf2f4475e7c0d5340 (diff)
parentcf12210757f568687646107555d61dd695c27b4c (diff)
downloadlatinime-f14bc5991e9577106a485fe9d2dc46a551256825.tar.gz
latinime-f14bc5991e9577106a485fe9d2dc46a551256825.tar.xz
latinime-f14bc5991e9577106a485fe9d2dc46a551256825.zip
am cf122107: Merge "[IL116] Inline a method"
* commit 'cf12210757f568687646107555d61dd695c27b4c': [IL116] Inline a method
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java25
1 files changed, 10 insertions, 15 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 0b0769423..76929f5d7 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -78,7 +78,6 @@ import com.android.inputmethod.latin.suggestions.SuggestionStripView;
import com.android.inputmethod.latin.suggestions.SuggestionStripViewAccessor;
import com.android.inputmethod.latin.utils.ApplicationUtils;
import com.android.inputmethod.latin.utils.CapsModeUtils;
-import com.android.inputmethod.latin.utils.CompletionInfoUtils;
import com.android.inputmethod.latin.utils.CoordinateUtils;
import com.android.inputmethod.latin.utils.ImportantNoticeUtils;
import com.android.inputmethod.latin.utils.IntentUtils;
@@ -1044,18 +1043,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
}
- private void setSuggestionStripShownInternal(final boolean isSuggestionStripVisible) {
- // TODO: Modify this if we support suggestions with hard keyboard
- if (!onEvaluateInputViewShown() || !hasSuggestionStripView()) {
- return;
- }
- if (isSuggestionStripVisible) {
- mSuggestionStripView.setVisibility(View.VISIBLE);
- } else {
- mSuggestionStripView.setVisibility(isFullscreenMode() ? View.GONE : View.INVISIBLE);
- }
- }
-
private int getAdjustedBackingViewHeight() {
final int currentHeight = mKeyPreviewBackingView.getHeight();
if (currentHeight > 0) {
@@ -1293,7 +1280,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
@Override
public void onStartBatchInput() {
- mInputLogic.onStartBatchInput(mSettings.getCurrent(), mKeyboardSwitcher, mHandler);
+ mInputLogic.onStartBatchInput(mSettings.getCurrent(), mKeyboardSwitcher, mHandler);
}
@Override
@@ -1399,7 +1386,15 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
SubtypeLocaleUtils.isRtlLanguage(mSubtypeSwitcher.getCurrentSubtype()));
}
mKeyboardSwitcher.onAutoCorrectionStateChanged(suggestedWords.mWillAutoCorrect);
- setSuggestionStripShownInternal(isSuggestionStripVisible);
+ // TODO: Modify this when we support suggestions with hard keyboard
+ if (!onEvaluateInputViewShown() || !hasSuggestionStripView()) {
+ return;
+ }
+ if (isSuggestionStripVisible) {
+ mSuggestionStripView.setVisibility(View.VISIBLE);
+ } else {
+ mSuggestionStripView.setVisibility(isFullscreenMode() ? View.GONE : View.INVISIBLE);
+ }
}
// TODO[IL]: Move this out of LatinIME.