From 574a7cc82d7320638669e99e25f232b1963f2f41 Mon Sep 17 00:00:00 2001 From: satok Date: Fri, 28 May 2010 01:01:19 +0900 Subject: [PATCH] Fix the bug that black symbols are shown when only one lanugage is selected. Change-Id: I15f83fc43d91c2c9d74b40fdcecdfe239242d565 --- java/res/xml-de/kbd_qwerty_black.xml | 189 +++++++++++++++ java/res/xml-fr/kbd_qwerty_black.xml | 192 ++++++++++++++++ java/res/xml-iw/kbd_qwerty_black.xml | 164 +++++++++++++ java/res/xml-ru/kbd_qwerty_black.xml | 173 ++++++++++++++ java/res/xml-sv/kbd_qwerty_black.xml | 215 ++++++++++++++++++ java/res/xml/kbd_qwerty_black.xml | 207 +++++++++++++++++ .../inputmethod/latin/KeyboardSwitcher.java | 7 +- .../inputmethod/latin/LatinKeyboard.java | 14 +- 8 files changed, 1157 insertions(+), 4 deletions(-) create mode 100755 java/res/xml-de/kbd_qwerty_black.xml create mode 100644 java/res/xml-fr/kbd_qwerty_black.xml create mode 100755 java/res/xml-iw/kbd_qwerty_black.xml create mode 100755 java/res/xml-ru/kbd_qwerty_black.xml create mode 100644 java/res/xml-sv/kbd_qwerty_black.xml create mode 100755 java/res/xml/kbd_qwerty_black.xml diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml new file mode 100755 index 000000000..366f87134 --- /dev/null +++ b/java/res/xml-de/kbd_qwerty_black.xml @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml new file mode 100644 index 000000000..1b799a51d --- /dev/null +++ b/java/res/xml-fr/kbd_qwerty_black.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml new file mode 100755 index 000000000..0dcf513e3 --- /dev/null +++ b/java/res/xml-iw/kbd_qwerty_black.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml new file mode 100755 index 000000000..e500b97f2 --- /dev/null +++ b/java/res/xml-ru/kbd_qwerty_black.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ¯ + , + + + + + diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml new file mode 100644 index 000000000..6604bc87c --- /dev/null +++ b/java/res/xml-sv/kbd_qwerty_black.xml @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml new file mode 100755 index 000000000..d013ae01b --- /dev/null +++ b/java/res/xml/kbd_qwerty_black.xml @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index ccf4c19aa..864bf73fa 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -215,6 +215,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha keyboard.setShifted(false); keyboard.setShiftLocked(keyboard.isShiftLocked()); keyboard.setImeOptions(mContext.getResources(), mMode, imeOptions); + keyboard.setBlackFlag(isBlackSym()); } private LatinKeyboard getKeyboard(KeyboardId id) { @@ -227,8 +228,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha LatinKeyboard keyboard = new LatinKeyboard( mContext, id.mXml, id.mKeyboardMode); keyboard.setVoiceMode(hasVoiceButton(id.mXml == R.xml.kbd_symbols), mHasVoice); - keyboard.setBlackFlag(isBlackSym()); keyboard.setLanguageSwitcher(mLanguageSwitcher); + keyboard.setBlackFlag(isBlackSym()); if (id.mKeyboardMode == KEYBOARDMODE_NORMAL || id.mKeyboardMode == KEYBOARDMODE_URL || id.mKeyboardMode == KEYBOARDMODE_IM @@ -403,6 +404,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha // TODO: Generalize for any theme public boolean isBlackSym () { - return (mLayoutId == 6 && mLanguageSwitcher.getInputLanguage().indexOf("en_") >= 0); + return (mLayoutId == 6 && (mLanguageSwitcher == null + || mLanguageSwitcher.getEnabledLanguages() == null + || mLanguageSwitcher.getInputLanguage().startsWith("en_"))); } } 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; + } } }