am 86953d17: DO NOT MERGE. Revise the setting hint visual and its handling code. This is a follow up change to I8b38e280.

Merge commit '86953d170d3a1c189628a373a5987cfc4c17c997' into gingerbread-plus-aosp

* commit '86953d170d3a1c189628a373a5987cfc4c17c997':
  DO NOT MERGE.  Revise the setting hint visual and its handling code.

1 files changed, 10 insertions, 3 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
index 832c76880..b1b82b64d 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
@@ -858,7 +858,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
                 final int drawableHeight;
                 final int drawableX;
                 final int drawableY;
-                if (isNumberAtEdgeOfPopupChars(key)) {
+                if (isLatinF1KeyOrNumberAtEdgeOfPopupChars(key)) {
                     drawableWidth = key.width;
                     drawableHeight = key.height;
                     drawableX = 0;
@@ -1226,13 +1226,20 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
         return false;
     }
 
+    private boolean isLatinF1KeyOrNumberAtEdgeOfPopupChars(Key key) {
+        return isNumberAtEdgeOfPopupChars(key) || isLatinF1Key(key);
+    }
+
     private boolean isNonMicLatinF1KeyOrNumberAtEdgeOfPopupChars(Key key) {
         return isNumberAtEdgeOfPopupChars(key) || isNonMicLatinF1Key(key);
     }
 
+    private boolean isLatinF1Key(Key key) {
+        return (mKeyboard instanceof LatinKeyboard) && ((LatinKeyboard)mKeyboard).isF1Key(key);
+    }
+
     private boolean isNonMicLatinF1Key(Key key) {
-        return (mKeyboard instanceof LatinKeyboard)
-                && ((LatinKeyboard)mKeyboard).isF1Key(key) && key.label != null;
+        return isLatinF1Key(key) && key.label != null;
     }
 
     private static boolean isNumberAtEdgeOfPopupChars(Key key) {