diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-10-11 22:39:04 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2010-10-12 14:01:28 +0900 |
| commit | 50a61083d3231e2f56b640c06686381de73aedc6 (patch) | |
| tree | 17397468b891839877f9b2a5d119ee78e9951a6c /java/src/com/android/inputmethod/latin/LatinKeyboard.java | |
| parent | 39004972b145065bf52e32d1d1cb361f96ed4501 (diff) | |
| download | latinime-50a61083d3231e2f56b640c06686381de73aedc6.tar.gz latinime-50a61083d3231e2f56b640c06686381de73aedc6.tar.xz latinime-50a61083d3231e2f56b640c06686381de73aedc6.zip | |
Add text variation keyboard layout
Change-Id: I4c6df8197b734feb998da78478a4d9a41f6d92b2
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboard.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinKeyboard.java | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java index 3fc484d09..11e7ef936 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java @@ -164,7 +164,7 @@ public class LatinKeyboard extends BaseKeyboard { mEnterKey.popupCharacters = null; mEnterKey.popupResId = 0; mEnterKey.text = null; - switch (options&(EditorInfo.IME_MASK_ACTION|EditorInfo.IME_FLAG_NO_ENTER_ACTION)) { + switch (options & (EditorInfo.IME_MASK_ACTION|EditorInfo.IME_FLAG_NO_ENTER_ACTION)) { case EditorInfo.IME_ACTION_GO: mEnterKey.iconPreview = null; mEnterKey.icon = null; @@ -193,19 +193,11 @@ public class LatinKeyboard extends BaseKeyboard { mEnterKey.label = res.getText(R.string.label_send_key); break; default: - if (mode == KeyboardSwitcher.MODE_IM) { - mEnterKey.icon = null; - mEnterKey.iconPreview = null; - mEnterKey.label = ":-)"; - mEnterKey.text = ":-) "; - mEnterKey.popupResId = R.xml.popup_smileys; - } else { - mEnterKey.iconPreview = res.getDrawable( - R.drawable.sym_keyboard_feedback_return); - mEnterKey.icon = res.getDrawable(mIsBlackSym ? - R.drawable.sym_bkeyboard_return : R.drawable.sym_keyboard_return); - mEnterKey.label = null; - } + mEnterKey.iconPreview = res.getDrawable( + R.drawable.sym_keyboard_feedback_return); + mEnterKey.icon = res.getDrawable(mIsBlackSym ? + R.drawable.sym_bkeyboard_return : R.drawable.sym_keyboard_return); + mEnterKey.label = null; break; } // Set the initial size of the preview icon |