aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2011-12-19 01:06:34 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-19 01:06:34 -0800
commit192e5b15a9c5eacb01b178c5dec72917a555cdc4 (patch)
tree0379577ceed8686073fd9c977b68030d2175c152 /java
parent5d399a6803f103a4ea394945decc7a043ae7c7a9 (diff)
parent4f7d278af62a89ef3f45cc9ebbfb076a5a352c76 (diff)
downloadlatinime-192e5b15a9c5eacb01b178c5dec72917a555cdc4.tar.gz
latinime-192e5b15a9c5eacb01b178c5dec72917a555cdc4.tar.xz
latinime-192e5b15a9c5eacb01b178c5dec72917a555cdc4.zip
am 4f7d278a: Follow-up fix for I68c667b0
* commit '4f7d278af62a89ef3f45cc9ebbfb076a5a352c76': Follow-up fix for I68c667b0
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/Keyboard.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java
index 9f4b8811d..d9d28f186 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java
@@ -403,7 +403,10 @@ public class Keyboard {
* point is out of range, then an array of size zero is returned.
*/
public Key[] getNearestKeys(int x, int y) {
- return mProximityInfo.getNearestKeys(x, y);
+ // Avoid dead pixels at edges of the keyboard
+ final int adjustedX = Math.max(0, Math.min(x, mOccupiedWidth - 1));
+ final int adjustedY = Math.max(0, Math.min(y, mOccupiedHeight - 1));
+ return mProximityInfo.getNearestKeys(adjustedX, adjustedY);
}
public static String printableCode(int code) {