aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2010-10-29 08:16:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-29 08:16:46 -0700
commitb5e8c7799726a5975283fa138ad2870ab02d01a4 (patch)
treeefd0f8bcdd5023cd044b544ed3c3c75fe0f902a3 /java/src
parente32a77c691567bdb3031d877e80786508bd47e4a (diff)
parent69db35c493aa3a6a9f17094bf2180a52ffb2358e (diff)
downloadlatinime-b5e8c7799726a5975283fa138ad2870ab02d01a4.tar.gz
latinime-b5e8c7799726a5975283fa138ad2870ab02d01a4.tar.xz
latinime-b5e8c7799726a5975283fa138ad2870ab02d01a4.zip
am 69db35c4: Make the buttons work for edge pixels of the keyboard
* commit '69db35c493aa3a6a9f17094bf2180a52ffb2358e': Make the buttons work for edge pixels of the keyboard
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinKeyboard.java4
-rw-r--r--java/src/com/android/inputmethod/latin/ProximityKeyDetector.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 096f3e702..45a4a9508 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -797,7 +797,9 @@ public class LatinKeyboard extends Keyboard {
if (mCurrentlyInSpace) {
return new int[] { mSpaceKeyIndex };
} else {
- return super.getNearestKeys(x, y);
+ // Avoid dead pixels at edges of the keyboard
+ return super.getNearestKeys(Math.max(0, Math.min(x, getMinWidth() - 1)),
+ Math.max(0, Math.min(y, getHeight() - 1)));
}
}
diff --git a/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java b/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java
index d17bedb56..325ce674c 100644
--- a/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java
+++ b/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java
@@ -83,4 +83,4 @@ class ProximityKeyDetector extends KeyDetector {
}
return primaryIndex;
}
-} \ No newline at end of file
+}