From 86953d170d3a1c189628a373a5987cfc4c17c997 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Sun, 17 Oct 2010 05:33:57 +0900 Subject: DO NOT MERGE. Revise the setting hint visual and its handling code. This is a follow up change to I8b38e280. bug: 3084022 Change-Id: I1062763d87b4498e19598b4e7d99bb91c510c6d2 --- .../android/inputmethod/latin/LatinKeyboardBaseView.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java') 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) { -- cgit v1.2.3-83-g751a