diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-10-07 02:21:15 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-10-07 02:21:15 -0700 |
| commit | beac24226b6a6303ff1821cf0ad57f146bb0e3d7 (patch) | |
| tree | 09906f5e56a0d7910fef25b87f31a4ed3d707bd6 /java/src | |
| parent | af0f13d15cd2edcb68fda9961c39dc6511edaafd (diff) | |
| parent | 416ee19d330f08e329cce4fd7cb66003cfb64f4a (diff) | |
| download | latinime-beac24226b6a6303ff1821cf0ad57f146bb0e3d7.tar.gz latinime-beac24226b6a6303ff1821cf0ad57f146bb0e3d7.tar.xz latinime-beac24226b6a6303ff1821cf0ad57f146bb0e3d7.zip | |
Merge "Add haptic feedback for caps lock"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 49e92fd2b..83871a602 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -649,7 +649,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha } public boolean isVibrateAndSoundFeedbackRequired() { - return mKeyboardView == null || !mKeyboardView.isInSlidingKeyInput(); + return mKeyboardView != null && !mKeyboardView.isInSlidingKeyInput(); } private int getPointerCount() { diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 36e97af11..892e5f558 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1259,6 +1259,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar break; case Keyboard.CODE_CAPSLOCK: switcher.toggleCapsLock(); + vibrate(); break; case Keyboard.CODE_SHORTCUT: mSubtypeSwitcher.switchToShortcutIME(); |