Merge "Dismiss the more suggestions when the user is sliding down the touch point"

1 files changed, 4 insertions, 5 deletions

diff --git a/java/src/com/android/inputmethod/latin/SuggestionsView.java b/java/src/com/android/inputmethod/latin/SuggestionsView.java
index b00036b49..13beb4479 100644
--- a/java/src/com/android/inputmethod/latin/SuggestionsView.java
+++ b/java/src/com/android/inputmethod/latin/SuggestionsView.java
@@ -808,11 +808,10 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
         final int translatedY = moreKeysPanel.translateY(y);
 
         if (mCheckingIfModalOrSlidingMode) {
-            final int deltaX = Math.abs(x - mOriginX);
-            final int deltaY = Math.abs(y - mOriginY);
-            if (deltaX >= mMoreSuggestionsModalTolerance
-                    || deltaY >= mMoreSuggestionsModalTolerance) {
-                // Decided to be in the sliding input mode
+            if (Math.abs(x - mOriginX) >= mMoreSuggestionsModalTolerance
+                    || mOriginY - y >= mMoreSuggestionsModalTolerance) {
+                // Decided to be in the sliding input mode only when the touch point has been moved
+                // upward.
                 mCheckingIfModalOrSlidingMode = false;
                 tracker.onShowMoreKeysPanel(
                         translatedX, translatedY, SystemClock.uptimeMillis(), moreKeysPanel);