aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinKeyboard.java
diff options
context:
space:
mode:
authorsatok <satok@google.com>2010-05-28 01:01:19 +0900
committersatok <satok@google.com>2010-05-28 02:01:32 +0900
commit574a7cc82d7320638669e99e25f232b1963f2f41 (patch)
tree2c9aafa54100993ea4dc665ff2ebfcc7a5e1a694 /java/src/com/android/inputmethod/latin/LatinKeyboard.java
parentbf336cb4a2a94d305d25f2a8a6ce638364f236c9 (diff)
downloadlatinime-574a7cc82d7320638669e99e25f232b1963f2f41.tar.gz
latinime-574a7cc82d7320638669e99e25f232b1963f2f41.tar.xz
latinime-574a7cc82d7320638669e99e25f232b1963f2f41.zip
Fix the bug that black symbols are shown when only one lanugage is selected.
Change-Id: I15f83fc43d91c2c9d74b40fdcecdfe239242d565
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboard.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinKeyboard.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index abc4992f5..eba0ec04e 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -288,13 +288,23 @@ public class LatinKeyboard extends Keyboard {
mSpaceIcon = mRes.getDrawable(R.drawable.sym_bkeyboard_space);
mMicIcon = mRes.getDrawable(R.drawable.sym_bkeyboard_mic);
m123MicIcon = mRes.getDrawable(R.drawable.sym_bkeyboard_123_mic);
- mF1Key.icon = mRes.getDrawable(R.drawable.sym_bkeyboard_mic);
+ if (mF1Key != null) {
+ mF1Key.icon = mMicIcon;
+ }
+ if (mSpaceKey != null) {
+ mSpaceKey.icon = mSpaceIcon;
+ }
} else {
mShiftLockIcon = mRes.getDrawable(R.drawable.sym_keyboard_shift_locked);
mSpaceIcon = mRes.getDrawable(R.drawable.sym_keyboard_space);
mMicIcon = mRes.getDrawable(R.drawable.sym_keyboard_mic);
m123MicIcon = mRes.getDrawable(R.drawable.sym_keyboard_123_mic);
- mF1Key.icon = mRes.getDrawable(R.drawable.sym_keyboard_mic);
+ if (mF1Key != null) {
+ mF1Key.icon = mMicIcon;
+ }
+ if (mSpaceKey != null) {
+ mSpaceKey.icon = mSpaceIcon;
+ }
}
}