aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-04-14 22:00:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-14 22:00:05 -0700
commit18414333d41ce877fb4a7aba76804cea2a8c89e3 (patch)
tree19ec9cb2103fedecfbebcca427510915c5e127a0 /java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
parent6223d82312d19afc5c0cbb10b3ece57f026cb723 (diff)
parente2af9b7eb519126e67fb054e8bd5064049958feb (diff)
downloadlatinime-18414333d41ce877fb4a7aba76804cea2a8c89e3.tar.gz
latinime-18414333d41ce877fb4a7aba76804cea2a8c89e3.tar.xz
latinime-18414333d41ce877fb4a7aba76804cea2a8c89e3.zip
am e2af9b7e: Merge "Reset vertical correction when more suggestions are in modal mode"
* commit 'e2af9b7eb519126e67fb054e8bd5064049958feb': Reset vertical correction when more suggestions are in modal mode
Diffstat (limited to 'java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java')
-rw-r--r--java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
index 4ef36fa46..2a21ec2f5 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
@@ -755,8 +755,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
@Override
public boolean dispatchTouchEvent(final MotionEvent me) {
- if (!mMoreSuggestionsView.isShowingInParent()
- || mMoreSuggestionsMode == MORE_SUGGESTIONS_IN_MODAL_MODE) {
+ if (!mMoreSuggestionsView.isShowingInParent()) {
mLastX = (int)me.getX();
mLastY = (int)me.getY();
if (mMoreSuggestionsSlidingDetector.onTouchEvent(me)) {
@@ -784,6 +783,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
} else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP) {
// Decided to be in the modal input mode
mMoreSuggestionsMode = MORE_SUGGESTIONS_IN_MODAL_MODE;
+ mMoreSuggestionsView.adjustVerticalCorrectionForModalMode();
}
return true;
}