diff options
13 files changed, 11 insertions, 6 deletions
diff --git a/res/drawable-hdpi/btn_keyboard_key_normal.9.png b/res/drawable-hdpi/btn_keyboard_key_normal.9.png Binary files differindex 5bd9f0ed6..42c7c146d 100644 --- a/res/drawable-hdpi/btn_keyboard_key_normal.9.png +++ b/res/drawable-hdpi/btn_keyboard_key_normal.9.png diff --git a/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png b/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png Binary files differindex aa4a4a368..01e2506b0 100644 --- a/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png +++ b/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png diff --git a/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png b/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png Binary files differindex 27556f845..83c6eb3fc 100644 --- a/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png +++ b/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png diff --git a/res/drawable-hdpi/btn_keyboard_key_pressed.9.png b/res/drawable-hdpi/btn_keyboard_key_pressed.9.png Binary files differindex e43504ce0..e047eaff1 100644 --- a/res/drawable-hdpi/btn_keyboard_key_pressed.9.png +++ b/res/drawable-hdpi/btn_keyboard_key_pressed.9.png diff --git a/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png b/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png Binary files differindex e55ab1ead..218a2d29e 100644 --- a/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png +++ b/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png diff --git a/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png b/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png Binary files differindex 02010b443..afe49512e 100644 --- a/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png +++ b/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png diff --git a/res/drawable-hdpi/sym_keyboard_feedback_123_mic_.png b/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png Binary files differindex f57e581d5..f57e581d5 100644 --- a/res/drawable-hdpi/sym_keyboard_feedback_123_mic_.png +++ b/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png diff --git a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png b/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png Binary files differindex 8f9b493ac..c7638bff1 100644 --- a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png +++ b/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png diff --git a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png b/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png Binary files differindex a2fbd0fd0..7acb07c86 100644 --- a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png +++ b/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png diff --git a/res/drawable-mdpi/sym_keyboard_feedback_123_mic_.png b/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png Binary files differindex bc11cf31a..bc11cf31a 100644 --- a/res/drawable-mdpi/sym_keyboard_feedback_123_mic_.png +++ b/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png diff --git a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png b/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png Binary files differindex 8ab87d05e..e3f80fada 100644 --- a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png +++ b/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png diff --git a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png b/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png Binary files differindex 92d19b5b1..3cb0d9913 100644 --- a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png +++ b/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png diff --git a/src/com/android/inputmethod/latin/LatinKeyboard.java b/src/com/android/inputmethod/latin/LatinKeyboard.java index 92f93b39c..9821a1610 100644 --- a/src/com/android/inputmethod/latin/LatinKeyboard.java +++ b/src/com/android/inputmethod/latin/LatinKeyboard.java @@ -56,6 +56,7 @@ public class LatinKeyboard extends Keyboard { private Key mEnterKey; private Key mF1Key; private Key mSpaceKey; + private Key m123Key; private int mSpaceKeyIndex = -1; private int mSpaceDragStartX; private int mSpaceDragLastDiff; @@ -103,6 +104,8 @@ public class LatinKeyboard extends Keyboard { mMicPreviewIcon = res.getDrawable(R.drawable.sym_keyboard_feedback_mic); mButtonArrowLeftIcon = res.getDrawable(R.drawable.sym_keyboard_language_arrows_left); mButtonArrowRightIcon = res.getDrawable(R.drawable.sym_keyboard_language_arrows_right); + m123MicIcon = res.getDrawable(R.drawable.sym_keyboard_123_mic); + m123MicPreviewIcon = res.getDrawable(R.drawable.sym_keyboard_feedback_123_mic); sSpacebarVerticalCorrection = res.getDimensionPixelOffset( R.dimen.spacebar_vertical_correction); setF1Key(); @@ -128,6 +131,9 @@ public class LatinKeyboard extends Keyboard { case 32: mSpaceKey = key; break; + case KEYCODE_MODE_CHANGE: + m123Key = key; + break; } return key; } @@ -267,6 +273,10 @@ public class LatinKeyboard extends Keyboard { mF1Key.codes = new int[] { ',' }; mF1Key.icon = null; mF1Key.iconPreview = null; + if (m123Key != null) { + m123Key.icon = m123MicIcon; + m123Key.iconPreview = m123MicPreviewIcon; + } } else { mF1Key.codes = new int[] { LatinKeyboardView.KEYCODE_VOICE }; mF1Key.label = null; @@ -560,20 +570,15 @@ public class LatinKeyboard extends Keyboard { public void draw(Canvas canvas) { canvas.save(); if (mHitThreshold) { - mTextPaint.setColor(0); + mTextPaint.setColor(0xFF000000); canvas.clipRect(0, 0, mWidth, mHeight); - int alpha = (255 * Math.max(0, mWidth / 2 - Math.abs(mDiff))) / (mWidth / 2); - mTextPaint.setAlpha(alpha); - if (mCurrentLanguage == null) { mCurrentLanguage = getInputLanguage(mWidth, mTextPaint); mNextLanguage = getNextInputLanguage(mWidth, mTextPaint); mPrevLanguage = getPrevInputLanguage(mWidth, mTextPaint); } - canvas.drawText(mCurrentLanguage, mWidth / 2 + mDiff, -mAscent + 4, mTextPaint); - mTextPaint.setAlpha(255 - alpha); canvas.drawText(mNextLanguage, mDiff - mWidth / 2, -mAscent + 4, mTextPaint); canvas.drawText(mPrevLanguage, |
