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

This commit is contained in:
Tadashi G. Takaoka 2011-09-12 21:32:40 -07:00 committed by Android (Google) Code Review
commit 02ce5392f5

View file

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