From d144b7874efc843bccc3ec7cd9a48d32d8f2395d Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 22 Sep 2014 15:30:29 +0900
Subject: Fix not intercepting touch event while in modal mode

Bug: 17600156
Change-Id: Ife8f04550411d88311e08dd33e370a410d791ca2
---
 .../android/inputmethod/latin/suggestions/SuggestionStripView.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java')

diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
index 33745a846..04264e664 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
@@ -393,6 +393,9 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
 
     @Override
     public boolean onInterceptTouchEvent(final MotionEvent me) {
+        if (mMoreSuggestionsView.isInModalMode()) {
+            return false;
+        }
         if (!mMoreSuggestionsView.isShowingInParent()) {
             mLastX = (int)me.getX();
             mLastY = (int)me.getY();
@@ -416,7 +419,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
 
         if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP) {
             // Decided to be in the modal input mode.
-            mMoreSuggestionsView.adjustVerticalCorrectionForModalMode();
+            mMoreSuggestionsView.setModalMode();
         }
         return false;
     }
-- 
cgit v1.2.3-83-g751a