nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix key preview when shifted hint letter is activated"

main
Tadashi G. Takaoka 2012-04-23 07:43:40 -07:00 committed by Android (Google) Code Review
parent 4849634c70 9dc1200b9b
commit 608691edb8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View File

@ -880,18 +880,19 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
final KeyPreviewDrawParams params = mKeyPreviewDrawParams; final KeyPreviewDrawParams params = mKeyPreviewDrawParams;
final int keyDrawX = key.mX + key.mVisualInsetsLeft; final int keyDrawX = key.mX + key.mVisualInsetsLeft;
final int keyDrawWidth = key.mWidth - key.mVisualInsetsLeft - key.mVisualInsetsRight; final int keyDrawWidth = key.mWidth - key.mVisualInsetsLeft - key.mVisualInsetsRight;
final String label = key.isShiftedLetterActivated() ? key.mHintLabel : key.mLabel;
// What we show as preview should match what we show on a key top in onBufferDraw(). // What we show as preview should match what we show on a key top in onBufferDraw().
if (key.mLabel != null) { if (label != null) {
// TODO Should take care of temporaryShiftLabel here. // TODO Should take care of temporaryShiftLabel here.
previewText.setCompoundDrawables(null, null, null, null); previewText.setCompoundDrawables(null, null, null, null);
if (StringUtils.codePointCount(key.mLabel) > 1) { if (StringUtils.codePointCount(label) > 1) {
previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, params.mKeyLetterSize); previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, params.mKeyLetterSize);
previewText.setTypeface(Typeface.DEFAULT_BOLD); previewText.setTypeface(Typeface.DEFAULT_BOLD);
} else { } else {
previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, params.mPreviewTextSize); previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, params.mPreviewTextSize);
previewText.setTypeface(params.mKeyTextStyle); previewText.setTypeface(params.mKeyTextStyle);
} }
previewText.setText(key.mLabel); previewText.setText(label);
} else { } else {
previewText.setCompoundDrawables(null, null, null, previewText.setCompoundDrawables(null, null, null,
key.getPreviewIcon(mKeyboard.mIconsSet)); key.getPreviewIcon(mKeyboard.mIconsSet));