nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit '97294530d939d1c623ef4ba9ec03b6aaf007fc78':
  Stop showing more suggestions while important notice is showing
main
Tadashi G. Takaoka 2014-09-24 06:59:32 +00:00 committed by Android Git Automerger
parent aadd46c2db 97294530d9
commit c1b41b2238
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
View File

@ -131,6 +131,10 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
mImportantNoticeStrip.setVisibility(VISIBLE); mImportantNoticeStrip.setVisibility(VISIBLE);
} }
public boolean isShowingImportantNoticeStrip() {
return mImportantNoticeStrip.getVisibility() == VISIBLE;
}
public boolean isShowingAddToDictionaryStrip() { public boolean isShowingAddToDictionaryStrip() {
return mAddToDictionaryStrip.getVisibility() == VISIBLE; return mAddToDictionaryStrip.getVisibility() == VISIBLE;
} }
@ -393,7 +397,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
@Override @Override
public boolean onInterceptTouchEvent(final MotionEvent me) { public boolean onInterceptTouchEvent(final MotionEvent me) {
if (mMoreSuggestionsView.isInModalMode()) { if (mStripVisibilityGroup.isShowingImportantNoticeStrip()) {
return false; return false;
} }
if (!mMoreSuggestionsView.isShowingInParent()) { if (!mMoreSuggestionsView.isShowingInParent()) {
@ -401,6 +405,9 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
mLastY = (int)me.getY(); mLastY = (int)me.getY();
return mMoreSuggestionsSlidingDetector.onTouchEvent(me); return mMoreSuggestionsSlidingDetector.onTouchEvent(me);
} }
if (mMoreSuggestionsView.isInModalMode()) {
return false;
}
final int action = me.getAction(); final int action = me.getAction();
final int index = me.getActionIndex(); final int index = me.getActionIndex();