diff options
author | 2013-08-08 15:56:30 -0700 | |
---|---|---|
committer | 2013-08-08 15:56:30 -0700 | |
commit | c31f7d79beebfdcad1b75ff60f5da3b4a20c1dbe (patch) | |
tree | cef08716b419c0a40a6fc1a33cc4c81b276756a7 /java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java | |
parent | 7cb1b82fe5fcb0952b85c5f5f1a8f58b15a64d90 (diff) | |
parent | 96b444d4292f0834c94b8d56ae124a6d6a947bd3 (diff) | |
download | latinime-c31f7d79beebfdcad1b75ff60f5da3b4a20c1dbe.tar.gz latinime-c31f7d79beebfdcad1b75ff60f5da3b4a20c1dbe.tar.xz latinime-c31f7d79beebfdcad1b75ff60f5da3b4a20c1dbe.zip |
am 96b444d4: Merge "Remove processMotionEvent from MoreKeysKeyboardView"
* commit '96b444d4292f0834c94b8d56ae124a6d6a947bd3':
Remove processMotionEvent from MoreKeysKeyboardView
Diffstat (limited to 'java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java')
-rw-r--r-- | java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java index 497a791d9..a8a14a825 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java +++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java @@ -270,15 +270,10 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick return super.dispatchTouchEvent(me); } - final MoreKeysPanel moreKeysPanel = mMoreSuggestionsView; final int action = me.getAction(); - final long eventTime = me.getEventTime(); final int index = me.getActionIndex(); - final int id = me.getPointerId(index); final int x = (int)me.getX(index); final int y = (int)me.getY(index); - final int translatedX = moreKeysPanel.translateX(x); - final int translatedY = moreKeysPanel.translateY(y); if (mMoreSuggestionsMode == MORE_SUGGESTIONS_CHECKING_MODAL_OR_SLIDING) { if (Math.abs(x - mOriginX) >= mMoreSuggestionsModalTolerance @@ -295,7 +290,8 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick } // MORE_SUGGESTIONS_IN_SLIDING_MODE - mMoreSuggestionsView.processMotionEvent(action, translatedX, translatedY, id, eventTime); + me.setLocation(mMoreSuggestionsView.translateX(x), mMoreSuggestionsView.translateY(y)); + mMoreSuggestionsView.onTouchEvent(me); return true; } |