diff options
| author |   Amith Yamasani <yamasani@google.com> | 2009-12-09 15:53:05 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2009-12-09 15:53:05 -0800 |
| commit | bfd76d002cb00f52c421e7606b26ad0e5a7ca2e3 (patch) | |
| tree | 1e16c6d3ea4097ae7ec1fa3be444ba1a1dbad82c /src/com/android/inputmethod/latin/KeyboardSwitcher.java | |
| parent | e10f56aeb11354e8e7ac290ea4892b2b2717b2c8 (diff) | |
| parent | 358e485b14938fbcb5af5be75aa29f2b73674100 (diff) | |
| download | latinime-bfd76d002cb00f52c421e7606b26ad0e5a7ca2e3.tar.gz latinime-bfd76d002cb00f52c421e7606b26ad0e5a7ca2e3.tar.xz latinime-bfd76d002cb00f52c421e7606b26ad0e5a7ca2e3.zip | |
am 358e485b: Experimental Extension keyboard
Merge commit '358e485b14938fbcb5af5be75aa29f2b73674100' into eclair-mr2-plus-aosp
* commit '358e485b14938fbcb5af5be75aa29f2b73674100':
Experimental Extension keyboard
Diffstat (limited to 'src/com/android/inputmethod/latin/KeyboardSwitcher.java')
| -rw-r--r-- | src/com/android/inputmethod/latin/KeyboardSwitcher.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/src/com/android/inputmethod/latin/KeyboardSwitcher.java index c82587b71..c7f90946d 100644 --- a/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -147,6 +147,13 @@ public class KeyboardSwitcher { if (!mKeyboards.containsKey(id)) { LatinKeyboard keyboard = new LatinKeyboard( mContext, id.mXml, id.mMode); + if (id.mMode == KEYBOARDMODE_NORMAL + || id.mMode == KEYBOARDMODE_URL + || id.mMode == KEYBOARDMODE_IM + || id.mMode == KEYBOARDMODE_EMAIL) { + keyboard.setExtension(R.xml.kbd_extension); + } + if (id.mEnableShiftLock) { keyboard.enableShiftLock(); } |