am 97294530: Merge "Stop showing more suggestions while important notice is showing" (c1b41b22) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -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();