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

Show a current locale in the space bar 

Change-Id: I317a0b0b20c3065f2e7454f7b44654a34b97500d
main
satok 2010-06-04 10:15:50 +09:00
parent 88327fb73b
commit 03d88c0b1f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/src/com/android/inputmethod/latin/LatinKeyboard.java
View File

@ -292,9 +292,6 @@ public class LatinKeyboard extends Keyboard {
if (mF1Key != null) { if (mF1Key != null) {
mF1Key.icon = mMicIcon; mF1Key.icon = mMicIcon;
} }
if (mSpaceKey != null) {
mSpaceKey.icon = mSpaceIcon;
}
} else { } else {
mShiftLockIcon = mRes.getDrawable(R.drawable.sym_keyboard_shift_locked); mShiftLockIcon = mRes.getDrawable(R.drawable.sym_keyboard_shift_locked);
mSpaceIcon = mRes.getDrawable(R.drawable.sym_keyboard_space); mSpaceIcon = mRes.getDrawable(R.drawable.sym_keyboard_space);
@ -303,9 +300,10 @@ public class LatinKeyboard extends Keyboard {
if (mF1Key != null) { if (mF1Key != null) {
mF1Key.icon = mMicIcon; mF1Key.icon = mMicIcon;
} }
if (mSpaceKey != null) { }
mSpaceKey.icon = mSpaceIcon; if (mSpaceKey != null) {
} mSpaceKey.icon = mSpaceIcon;
updateSpaceBarForLocale(f);
} }
} }
@ -346,7 +344,7 @@ public class LatinKeyboard extends Keyboard {
} }
} }
private void updateSpaceBarForLocale() { private void updateSpaceBarForLocale(boolean isBlack) {
if (mLocale != null) { if (mLocale != null) {
// Create the graphic for spacebar // Create the graphic for spacebar
Bitmap buffer = Bitmap.createBitmap(mSpaceKey.width, mSpaceIcon.getIntrinsicHeight(), Bitmap buffer = Bitmap.createBitmap(mSpaceKey.width, mSpaceIcon.getIntrinsicHeight(),
@ -356,7 +354,8 @@ public class LatinKeyboard extends Keyboard {
mSpaceKey.icon = new BitmapDrawable(mRes, buffer); mSpaceKey.icon = new BitmapDrawable(mRes, buffer);
mSpaceKey.repeatable = mLanguageSwitcher.getLocaleCount() < 2; mSpaceKey.repeatable = mLanguageSwitcher.getLocaleCount() < 2;
} else { } else {
mSpaceKey.icon = mRes.getDrawable(R.drawable.sym_keyboard_space); mSpaceKey.icon = isBlack ? mRes.getDrawable(R.drawable.sym_bkeyboard_space)
: mRes.getDrawable(R.drawable.sym_keyboard_space);
mSpaceKey.repeatable = true; mSpaceKey.repeatable = true;
} }
} }
@ -461,7 +460,7 @@ public class LatinKeyboard extends Keyboard {
} }
if (mLocale != null && mLocale.equals(locale)) return; if (mLocale != null && mLocale.equals(locale)) return;
mLocale = locale; mLocale = locale;
updateSpaceBarForLocale(); updateSpaceBarForLocale(mIsBlackSym);
} }
boolean isCurrentlyInSpace() { boolean isCurrentlyInSpace() {