From 86953d170d3a1c189628a373a5987cfc4c17c997 Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Sun, 17 Oct 2010 05:33:57 +0900
Subject: [PATCH] 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
---
 java/res/drawable-hdpi/hint_settings.9.png    | Bin 236 -> 226 bytes
 java/res/drawable-mdpi/hint_settings.9.png    | Bin 222 -> 202 bytes
 .../inputmethod/latin/LatinKeyboard.java      |  42 +++++++++---------
 .../latin/LatinKeyboardBaseView.java          |  13 ++++--
 4 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/java/res/drawable-hdpi/hint_settings.9.png b/java/res/drawable-hdpi/hint_settings.9.png
index 85c183a61728680e7cb9f9291c791606a498d2a6..b5ec003e655b5cd6de5ca98e10bbf849aed0fe37 100644
GIT binary patch
delta 157
zcmaFE_=s_WIF}^{8v_GF$&ZSniHaI-EuJopAr-gY+%)7mpuoc#5L|UcZgcq-rC2MG
zm_-Wj^&g4IGX@H6y*6oP#|ze|xgKjL^Uf3%fPx8o=0uk)-n(J@#C}n`ERUC)|J+I3
z*Vh07Do?AfR~P)}wmhX~IFF5y@n>AVHoxVkvlT273^R6Ld8qka!U5<E22WQ%mvv4F
FO#q~WJ^cUx

delta 167
zcmaFF_=a(UIF}0t8v_HwVVAVriHaI-eV#6kAr-gY+&1Jopuoc#5L|UcZgcq-rMD3U
zp1Pm@DfvB|=ql6`m3`93<qOkVza`gBw$+FVK*5APZ@fzu@7*wcV!x<Ij>pU0f9|C2
z>uUf3m8Uz-7k~K2b@P<c#(8XvaPZUg$<H_wZRN=qyc-x9?x%h|U34|59q1qiPgg&e
IbxsLQ03X{#RsaA1

diff --git a/java/res/drawable-mdpi/hint_settings.9.png b/java/res/drawable-mdpi/hint_settings.9.png
index 5077f3e6a833fa57a5eddb62a6b7a82523869b1f..444cc26ee69c1e754a95d8c977e7169fab1e9321 100644
GIT binary patch
delta 172
zcmcb|c#2W6Gr-TCmrII^fq{Y7)59eQNGk!cItLq&%<7s|I8jlfKF8C=F{I+wn;VW?
z2NZZ*0+&~~ysw`ca&YOk08zGI%uTC51Ski(x<v7Mn)+sF9_KsJw_}ng1LG&Ln~WDv
z&0ovN#KIw<;LyOpXw<x=?&6~S(u$%>Hvjp8epSr+y^bT)`D%@o^78e6FY-UpJ;3nt
XimYv@cKSP@{S2P2elF{rm=c-*_mVz0

delta 192
zcmX@bc#l!BGr-TCmrII^fq{Y7)59eQNGk%dE(aTsR8V6QnW(5y-{9%u7*cWT&2&eu
z0}2AnzAuG;|6hNDtx80H<BlnuIu%iEYurNL?^T`jgw5-hjPCSHY}yJ*b2FPu=A_PH
zVCpCm;IjtO910B};veI~>1Ts)&lPz5!Mxz8dEaHj3tzA0#9rondr!EJUFh;Bl>(ru
ntow^5tNd2-YUixw7BgVb<dP2Q_s-Y~bQFW9tDnm{r-UW|Fxx_d

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 8060ac996..d04fc586a 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -61,7 +61,7 @@ public class LatinKeyboard extends Keyboard {
     private Key mShiftKey;
     private Key mEnterKey;
     private Key mF1Key;
-    private Drawable mF1HintIcon;
+    private final Drawable mF1HintIcon;
     private Key mSpaceKey;
     private Key m123Key;
     private final int NUMBER_HINT_COUNT = 10;
@@ -405,8 +405,7 @@ public class LatinKeyboard extends Keyboard {
     private void setMicF1Key(Key key) {
         // HACK: draw mMicIcon and mF1HintIcon at the same time
         final Drawable micWithSettingsHintDrawable = new BitmapDrawable(mRes,
-                drawSynthesizedSettingsHintImage(key.width, key.height + mVerticalGap,
-                        mMicIcon, mF1HintIcon));
+                drawSynthesizedSettingsHintImage(key.width, key.height, mMicIcon, mF1HintIcon));
 
         key.label = null;
         key.codes = new int[] { LatinKeyboardView.KEYCODE_VOICE };
@@ -416,16 +415,10 @@ public class LatinKeyboard extends Keyboard {
     }
 
     private void setNonMicF1Key(Key key, String label, int popupResId) {
-        // HACK: draw only mF1HintIcon on offscreen buffer to adjust position of '...' to
-        // the mic+hint synthesized icon
-        final Drawable onlySettingsHintDrawable = new BitmapDrawable(mRes,
-                drawSynthesizedSettingsHintImage(key.width, key.height + mVerticalGap,
-                        null, mF1HintIcon));
-
         key.label = label;
         key.codes = new int[] { label.charAt(0) };
         key.popupResId = popupResId;
-        key.icon = onlySettingsHintDrawable;
+        key.icon = mF1HintIcon;
         key.iconPreview = null;
     }
 
@@ -477,24 +470,29 @@ public class LatinKeyboard extends Keyboard {
         return bounds.width();
     }
 
-    // Overlay two images.  Note that mainIcon can be null.
+    // Overlay two images: mainIcon and hintIcon.
     private Bitmap drawSynthesizedSettingsHintImage(
             int width, int height, Drawable mainIcon, Drawable hintIcon) {
-        if (hintIcon == null)
+        if (mainIcon == null || hintIcon == null)
             return null;
+        Rect hintIconPadding = new Rect(0, 0, 0, 0);
+        hintIcon.getPadding(hintIconPadding);
         final Bitmap buffer = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         final Canvas canvas = new Canvas(buffer);
         canvas.drawColor(mRes.getColor(R.color.latinkeyboard_transparent), PorterDuff.Mode.CLEAR);
-        // draw main icon at centered position
-        if (mainIcon != null) {
-            setDefaultBounds(mainIcon);
-            final int drawableX = (width - mainIcon.getIntrinsicWidth()) / 2;
-            final int drawableY = (height - mainIcon.getIntrinsicHeight()) / 2;
-            canvas.translate(drawableX, drawableY);
-            mainIcon.draw(canvas);
-            canvas.translate(-drawableX, -drawableY);
-        }
-        // draw hint icon fully in the key
+
+        // Draw main icon at the center of the key visual
+        // Assuming the hintIcon shares the same padding with the key's background drawable
+        final int drawableX = (width + hintIconPadding.left - hintIconPadding.right
+                - mainIcon.getIntrinsicWidth()) / 2;
+        final int drawableY = (height + hintIconPadding.top - hintIconPadding.bottom
+                - mainIcon.getIntrinsicHeight()) / 2;
+        setDefaultBounds(mainIcon);
+        canvas.translate(drawableX, drawableY);
+        mainIcon.draw(canvas);
+        canvas.translate(-drawableX, -drawableY);
+
+        // Draw hint icon fully in the key
         hintIcon.setBounds(0, 0, width, height);
         hintIcon.draw(canvas);
         return buffer;
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) {