Updated some keyboard assets.

Let the arrows obscure the sliding language text to create the fade effect.
Initialize the preview icon bounds.
main
Amith Yamasani 2010-02-02 10:42:32 -08:00
parent 3f7d75060a
commit cc03f196ad
13 changed files with 11 additions and 6 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 715 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1001 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 745 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 322 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 328 B

View File

Before

Width:  |  Height:  |  Size: 694 B

After

Width:  |  Height:  |  Size: 694 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 249 B

View File

@ -56,6 +56,7 @@ public class LatinKeyboard extends Keyboard {
private Key mEnterKey; private Key mEnterKey;
private Key mF1Key; private Key mF1Key;
private Key mSpaceKey; private Key mSpaceKey;
private Key m123Key;
private int mSpaceKeyIndex = -1; private int mSpaceKeyIndex = -1;
private int mSpaceDragStartX; private int mSpaceDragStartX;
private int mSpaceDragLastDiff; private int mSpaceDragLastDiff;
@ -103,6 +104,8 @@ public class LatinKeyboard extends Keyboard {
mMicPreviewIcon = res.getDrawable(R.drawable.sym_keyboard_feedback_mic); mMicPreviewIcon = res.getDrawable(R.drawable.sym_keyboard_feedback_mic);
mButtonArrowLeftIcon = res.getDrawable(R.drawable.sym_keyboard_language_arrows_left); mButtonArrowLeftIcon = res.getDrawable(R.drawable.sym_keyboard_language_arrows_left);
mButtonArrowRightIcon = res.getDrawable(R.drawable.sym_keyboard_language_arrows_right); 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( sSpacebarVerticalCorrection = res.getDimensionPixelOffset(
R.dimen.spacebar_vertical_correction); R.dimen.spacebar_vertical_correction);
setF1Key(); setF1Key();
@ -128,6 +131,9 @@ public class LatinKeyboard extends Keyboard {
case 32: case 32:
mSpaceKey = key; mSpaceKey = key;
break; break;
case KEYCODE_MODE_CHANGE:
m123Key = key;
break;
} }
return key; return key;
} }
@ -267,6 +273,10 @@ public class LatinKeyboard extends Keyboard {
mF1Key.codes = new int[] { ',' }; mF1Key.codes = new int[] { ',' };
mF1Key.icon = null; mF1Key.icon = null;
mF1Key.iconPreview = null; mF1Key.iconPreview = null;
if (m123Key != null) {
m123Key.icon = m123MicIcon;
m123Key.iconPreview = m123MicPreviewIcon;
}
} else { } else {
mF1Key.codes = new int[] { LatinKeyboardView.KEYCODE_VOICE }; mF1Key.codes = new int[] { LatinKeyboardView.KEYCODE_VOICE };
mF1Key.label = null; mF1Key.label = null;
@ -560,20 +570,15 @@ public class LatinKeyboard extends Keyboard {
public void draw(Canvas canvas) { public void draw(Canvas canvas) {
canvas.save(); canvas.save();
if (mHitThreshold) { if (mHitThreshold) {
mTextPaint.setColor(0); mTextPaint.setColor(0xFF000000);
canvas.clipRect(0, 0, mWidth, mHeight); 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) { if (mCurrentLanguage == null) {
mCurrentLanguage = getInputLanguage(mWidth, mTextPaint); mCurrentLanguage = getInputLanguage(mWidth, mTextPaint);
mNextLanguage = getNextInputLanguage(mWidth, mTextPaint); mNextLanguage = getNextInputLanguage(mWidth, mTextPaint);
mPrevLanguage = getPrevInputLanguage(mWidth, mTextPaint); mPrevLanguage = getPrevInputLanguage(mWidth, mTextPaint);
} }
canvas.drawText(mCurrentLanguage, canvas.drawText(mCurrentLanguage,
mWidth / 2 + mDiff, -mAscent + 4, mTextPaint); mWidth / 2 + mDiff, -mAscent + 4, mTextPaint);
mTextPaint.setAlpha(255 - alpha);
canvas.drawText(mNextLanguage, canvas.drawText(mNextLanguage,
mDiff - mWidth / 2, -mAscent + 4, mTextPaint); mDiff - mWidth / 2, -mAscent + 4, mTextPaint);
canvas.drawText(mPrevLanguage, canvas.drawText(mPrevLanguage,