commit 3614dd458f8c74ac06471f03e3af49c4359abee3
author Mike Cleron <mcleron@google.com> Fri Oct 29 15:06:33 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 29 15:06:33 2010 -0700
tree bffe81c9aab9e8218f056030bc7b826a288a5ab2
parent 69db35c493aa3a6a9f17094bf2180a52ffb2358e
parent 9bbac774900ff1c5f09831a99774cb22709399f9

Merge "DO NOT MERGE. Fix the size of preview text" into gingerbread

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 096f3e7..45a4a95 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -797,7 +797,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 d17bedb..325ce67 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
+}