diff options
| author |   satok <satok@google.com> | 2010-05-27 21:26:23 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-05-27 22:14:24 +0900 |
| commit | bf336cb4a2a94d305d25f2a8a6ce638364f236c9 (patch) | |
| tree | 49df18ed383002076b9ea82bf6ec9144627f6cfb /java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | |
| parent | f22d479e48c2cd951f64e4f4a2b1202e7860c240 (diff) | |
| download | latinime-bf336cb4a2a94d305d25f2a8a6ce638364f236c9.tar.gz latinime-bf336cb4a2a94d305d25f2a8a6ce638364f236c9.tar.xz latinime-bf336cb4a2a94d305d25f2a8a6ce638364f236c9.zip | |
Change symbol to use black icons
Change-Id: I834efd322b4ef6e99707028d38223d837a3d4e36
Diffstat (limited to 'java/src/com/android/inputmethod/latin/KeyboardSwitcher.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index c8e226d75..ccf4c19aa 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -227,6 +227,7 @@ 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); if (id.mKeyboardMode == KEYBOARDMODE_NORMAL || id.mKeyboardMode == KEYBOARDMODE_URL @@ -250,6 +251,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha private KeyboardId getKeyboardId(int mode, int imeOptions, boolean isSymbols) { boolean hasVoice = hasVoiceButton(isSymbols); + // TODO: generalize for any KeyboardId + int keyboardRowsResId = isBlackSym() ? R.xml.kbd_qwerty_black : R.xml.kbd_qwerty; if (isSymbols) { return (mode == MODE_PHONE) ? new KeyboardId(R.xml.kbd_phone_symbols, hasVoice) @@ -258,7 +261,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha switch (mode) { case MODE_TEXT: if (mTextMode == MODE_TEXT_QWERTY) { - return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_NORMAL, true, hasVoice); + return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_NORMAL, true, hasVoice); } else if (mTextMode == MODE_TEXT_ALPHA) { return new KeyboardId(R.xml.kbd_alpha, KEYBOARDMODE_NORMAL, true, hasVoice); } @@ -268,13 +271,13 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha case MODE_PHONE: return new KeyboardId(R.xml.kbd_phone, hasVoice); case MODE_URL: - return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_URL, true, hasVoice); + return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_URL, true, hasVoice); case MODE_EMAIL: - return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_EMAIL, true, hasVoice); + return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_EMAIL, true, hasVoice); case MODE_IM: - return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_IM, true, hasVoice); + return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_IM, true, hasVoice); case MODE_WEB: - return new KeyboardId(R.xml.kbd_qwerty, KEYBOARDMODE_WEB, true, hasVoice); + return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_WEB, true, hasVoice); } return null; } @@ -397,4 +400,9 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha Integer.valueOf(sharedPreferences.getString(key, DEFAULT_LAYOUT_ID)), false); } } + + // TODO: Generalize for any theme + public boolean isBlackSym () { + return (mLayoutId == 6 && mLanguageSwitcher.getInputLanguage().indexOf("en_") >= 0); + } } |