diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-02-01 02:11:19 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-02-01 02:11:19 -0800 |
| commit | c5163f91b2841dd2e86c67da18567a910542d1ca (patch) | |
| tree | 8798731ed994ca8eb3eec4a1b626f6f5c8296199 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 0773460c349321cfb36a66721271dcad2e4f0de0 (diff) | |
| parent | a5c96f376ad57e78a88942bb618e067054ed818a (diff) | |
| download | latinime-c5163f91b2841dd2e86c67da18567a910542d1ca.tar.gz latinime-c5163f91b2841dd2e86c67da18567a910542d1ca.tar.xz latinime-c5163f91b2841dd2e86c67da18567a910542d1ca.zip | |
am a5c96f37: Move long press shift handling from PointerTracker to KeyboardState
* commit 'a5c96f376ad57e78a88942bb618e067054ed818a':
Move long press shift handling from PointerTracker to KeyboardState
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 1e7171406..ef8fd1379 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1296,10 +1296,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar case Keyboard.CODE_SETTINGS: onSettingsKeyPressed(); break; - case Keyboard.CODE_CAPSLOCK: - // Caps lock code is handled in KeyboardSwitcher.onCodeInput() below. - hapticAndAudioFeedback(primaryCode); - break; case Keyboard.CODE_SHORTCUT: mSubtypeSwitcher.switchToShortcutIME(); break; @@ -2294,18 +2290,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar loadSettings(); } - private void hapticAndAudioFeedback(int primaryCode) { + public void hapticAndAudioFeedback(int primaryCode) { vibrate(); playKeyClick(primaryCode); } @Override public void onPressKey(int primaryCode) { - final KeyboardSwitcher switcher = mKeyboardSwitcher; - if (switcher.isVibrateAndSoundFeedbackRequired()) { - hapticAndAudioFeedback(primaryCode); - } - switcher.onPressKey(primaryCode); + mKeyboardSwitcher.onPressKey(primaryCode); } @Override @@ -2313,7 +2305,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mKeyboardSwitcher.onReleaseKey(primaryCode, withSliding); } - // receive ringer mode change and network state change. private BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override |