New keyboard layout for bottom row.

Additional mode for WEB_EDIT fields w/Tab key for next field.
Button assets refresh and fix for a highlight asset bug.

3 files changed, 16 insertions, 3 deletions

diff --git a/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index aa52c0381..45d0a1e12 100644
--- a/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -33,6 +33,7 @@ public class KeyboardSwitcher {
     public static final int MODE_URL = 4;
     public static final int MODE_EMAIL = 5;
     public static final int MODE_IM = 6;
+    public static final int MODE_WEB = 7;
     
     public static final int MODE_TEXT_QWERTY = 0;
     public static final int MODE_TEXT_ALPHA = 1;
@@ -42,6 +43,7 @@ public class KeyboardSwitcher {
     public static final int KEYBOARDMODE_URL = R.id.mode_url;
     public static final int KEYBOARDMODE_EMAIL = R.id.mode_email;
     public static final int KEYBOARDMODE_IM = R.id.mode_im;
+    public static final int KEYBOARDMODE_WEB = R.id.mode_webentry;
 
     private static final int SYMBOLS_MODE_STATE_NONE = 0;
     private static final int SYMBOLS_MODE_STATE_BEGIN = 1;
@@ -52,7 +54,8 @@ public class KeyboardSwitcher {
         KEYBOARDMODE_NORMAL,
         KEYBOARDMODE_URL,
         KEYBOARDMODE_EMAIL,
-        KEYBOARDMODE_IM};
+        KEYBOARDMODE_IM,
+        KEYBOARDMODE_WEB};
 
     //LatinIME mContext;
     Context mContext;
@@ -91,6 +94,7 @@ public class KeyboardSwitcher {
         mModeToVoice.put(R.id.mode_url, R.id.mode_url_voice);
         mModeToVoice.put(R.id.mode_email, R.id.mode_email_voice);
         mModeToVoice.put(R.id.mode_im, R.id.mode_im_voice);
+        mModeToVoice.put(R.id.mode_webentry, R.id.mode_webentry_voice);
         mInputMethodService = ims;
     }
 
@@ -212,10 +216,12 @@ public class KeyboardSwitcher {
                     || id.mKeyboardMode == KEYBOARDMODE_URL
                     || id.mKeyboardMode == KEYBOARDMODE_IM
                     || id.mKeyboardMode == KEYBOARDMODE_EMAIL
+                    || id.mKeyboardMode == KEYBOARDMODE_WEB
                     || id.mKeyboardMode == R.id.mode_normal_voice
                     || id.mKeyboardMode == R.id.mode_url_voice
                     || id.mKeyboardMode == R.id.mode_im_voice
                     || id.mKeyboardMode == R.id.mode_email_voice
+                    || id.mKeyboardMode == R.id.mode_webentry_voice
                     ) {
                 keyboard.setExtension(R.xml.kbd_extension);
             }
@@ -255,6 +261,8 @@ public class KeyboardSwitcher {
                 return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_EMAIL, true);
             case MODE_IM:
                 return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_IM, true);
+            case MODE_WEB:
+                return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_WEB, true);
         }
         return null;
     }
diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index a9a61c3a2..7eecfb9b9 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -502,6 +502,8 @@ public class LatinIME extends InputMethodService
                 } else if (variation == EditorInfo.TYPE_TEXT_VARIATION_FILTER) {
                     mPredictionOn = false;
                 } else if (variation == EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) {
+                    mKeyboardSwitcher.setKeyboardMode(KeyboardSwitcher.MODE_WEB,
+                            attribute.imeOptions, mEnableVoiceButton);
                     // If it's a browser edit field and auto correct is not ON explicitly, then
                     // disable auto correction, but keep suggestions on.
                     if ((attribute.inputType & EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT) == 0) {
@@ -915,6 +917,9 @@ public class LatinIME extends InputMethodService
                     startListening(false /* was a button press, was not a swipe */);
                 }
                 break;
+            case 9 /*Tab*/:
+                sendKeyChar((char) primaryCode);
+                break;
             default:
                 if (isWordSeparator(primaryCode)) {
                     handleSeparator(primaryCode);
diff --git a/src/com/android/inputmethod/latin/LatinKeyboard.java b/src/com/android/inputmethod/latin/LatinKeyboard.java
index f5748f415..df38358d6 100644
--- a/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -261,11 +261,11 @@ public class LatinKeyboard extends Keyboard {
             Paint paint = new Paint();
             paint.setAntiAlias(true);
             // TODO: Make the text size a customizable attribute
-            paint.setTextSize(22);
+            paint.setTextSize(18);
             paint.setTextAlign(Align.CENTER);
             // Draw a drop shadow for the text
             paint.setShadowLayer(1f, 0, 0, 0xFF000000);
-            paint.setColor(0x80C0C0C0);
+            paint.setColor(0xFF808080);
             canvas.drawText(mLocale.getDisplayLanguage(mLocale),
                     buffer.getWidth() / 2, - paint.ascent() + 2, paint);
             int x = (buffer.getWidth() - mSpaceIcon.getIntrinsicWidth()) / 2;