diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-08-30 08:05:42 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 08:05:42 -0700 |
| commit | 1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1 (patch) | |
| tree | 35d35980f6dd21e04789dab9ed04d2f9fecf53e6 /java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | |
| parent | 36007521cef25259150127c83ccba5fe38eda14c (diff) | |
| parent | ed5ce6c1a3d3a38a28cd2ed480a4d877160fa6ae (diff) | |
| download | latinime-1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1.tar.gz latinime-1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1.tar.xz latinime-1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1.zip | |
am ed5ce6c1: Merge "Remove extension keyboard" into gingerbread
Merge commit 'ed5ce6c1a3d3a38a28cd2ed480a4d877160fa6ae' into gingerbread-plus-aosp
* commit 'ed5ce6c1a3d3a38a28cd2ed480a4d877160fa6ae':
Remove extension keyboard
Diffstat (limited to 'java/src/com/android/inputmethod/latin/KeyboardSwitcher.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index dec29b7cb..45a54b1aa 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -261,14 +261,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha || id.mXml == R.xml.kbd_symbols_black), mHasVoice); keyboard.setLanguageSwitcher(mLanguageSwitcher); keyboard.setBlackFlag(isBlackSym()); - if (id.mKeyboardMode == KEYBOARDMODE_NORMAL - || id.mKeyboardMode == KEYBOARDMODE_URL - || id.mKeyboardMode == KEYBOARDMODE_IM - || id.mKeyboardMode == KEYBOARDMODE_EMAIL - || id.mKeyboardMode == KEYBOARDMODE_WEB - ) { - keyboard.setExtension(R.xml.kbd_extension); - } if (id.mEnableShiftLock) { keyboard.enableShiftLock(); @@ -439,7 +431,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha mLayoutId + "," + newLayout, e); } } - mInputView.setExtentionLayoutResId(THEMES[newLayout]); mInputView.setOnKeyboardActionListener(mInputMethodService); mLayoutId = newLayout; } |