am 97294530: Merge "Stop showing more suggestions while important notice is showing"

* commit '97294530d939d1c623ef4ba9ec03b6aaf007fc78':
  Stop showing more suggestions while important notice is showing

1 files changed, 8 insertions, 1 deletions

diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
index 197a544d1..43f6175ca 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
@@ -131,6 +131,10 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
             mImportantNoticeStrip.setVisibility(VISIBLE);
         }
 
+        public boolean isShowingImportantNoticeStrip() {
+            return mImportantNoticeStrip.getVisibility() == VISIBLE;
+        }
+
         public boolean isShowingAddToDictionaryStrip() {
             return mAddToDictionaryStrip.getVisibility() == VISIBLE;
         }
@@ -393,7 +397,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
 
     @Override
     public boolean onInterceptTouchEvent(final MotionEvent me) {
-        if (mMoreSuggestionsView.isInModalMode()) {
+        if (mStripVisibilityGroup.isShowingImportantNoticeStrip()) {
             return false;
         }
         if (!mMoreSuggestionsView.isShowingInParent()) {
@@ -401,6 +405,9 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
             mLastY = (int)me.getY();
             return mMoreSuggestionsSlidingDetector.onTouchEvent(me);
         }
+        if (mMoreSuggestionsView.isInModalMode()) {
+            return false;
+        }
 
         final int action = me.getAction();
         final int index = me.getActionIndex();