commit 2a952e9b7ea738e1472cada605847e26c60f787a
author Ken Wakasa <kwakasa@google.com> Fri Oct 29 08:28:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 29 08:28:28 2010 -0700
tree 09a5e3a600e22a4a80eb016421368327a884abfc
parent c1fe5bf19d8397c0de6ddb57421e99e6a258ed1a
parent b5e8c7799726a5975283fa138ad2870ab02d01a4

am b5e8c779: am 69db35c4: Make the buttons work for edge pixels of the keyboard

* commit 'b5e8c7799726a5975283fa138ad2870ab02d01a4':
  Make the buttons work for edge pixels of the keyboard

java/src/com/android/inputmethod/latin/LatinKeyboard.java

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 6494bdf..15a8cf7 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -715,7 +715,9 @@
         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)));
         }
     }
 

java/src/com/android/inputmethod/latin/ProximityKeyDetector.java

diff --git a/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java b/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java
index a6ff8cf..383bd7f 100644
--- a/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java
+++ b/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java
@@ -83,4 +83,4 @@
         }
         return primaryIndex;
     }
-}
\ No newline at end of file
+}