summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2010-07-30 16:34:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-30 16:34:06 -0700
commitc8f5e437194129e397cf323fa857f3485f58f4cc (patch)
tree6d4b3146f0ef200c01367523e78c09a9ac4e0f55 /core/java
parent86dde2d64c7eadc06a17aeb486c669ce4b53d13c (diff)
parent0972d071cd1b5eba60a6c20551f4500b638a1bf1 (diff)
downloadframeworks_base-c8f5e437194129e397cf323fa857f3485f58f4cc.zip
frameworks_base-c8f5e437194129e397cf323fa857f3485f58f4cc.tar.gz
frameworks_base-c8f5e437194129e397cf323fa857f3485f58f4cc.tar.bz2
Merge "Fix KeyboardView's verticalCorrection handling"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/inputmethodservice/KeyboardView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/inputmethodservice/KeyboardView.java b/core/java/android/inputmethodservice/KeyboardView.java
index 4b48409..ab5c78a 100644
--- a/core/java/android/inputmethodservice/KeyboardView.java
+++ b/core/java/android/inputmethodservice/KeyboardView.java
@@ -1128,7 +1128,9 @@ public class KeyboardView extends View implements View.OnClickListener {
private boolean onModifiedTouchEvent(MotionEvent me, boolean possiblePoly) {
int touchX = (int) me.getX() - mPaddingLeft;
- int touchY = (int) me.getY() + mVerticalCorrection - mPaddingTop;
+ int touchY = (int) me.getY() - mPaddingTop;
+ if (touchY >= -mVerticalCorrection)
+ touchY += mVerticalCorrection;
final int action = me.getAction();
final long eventTime = me.getEventTime();
mOldEventTime = eventTime;