diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-10-07 05:46:31 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-10-07 05:46:31 -0700 |
| commit | 158f1cce3da9872e089c5d94530d17bfde831b85 (patch) | |
| tree | 09906f5e56a0d7910fef25b87f31a4ed3d707bd6 /java/src | |
| parent | 276174e543ef59cae5b3554347ef0df4f1e76544 (diff) | |
| parent | beac24226b6a6303ff1821cf0ad57f146bb0e3d7 (diff) | |
| download | latinime-158f1cce3da9872e089c5d94530d17bfde831b85.tar.gz latinime-158f1cce3da9872e089c5d94530d17bfde831b85.tar.xz latinime-158f1cce3da9872e089c5d94530d17bfde831b85.zip | |
am beac2422: Merge "Add haptic feedback for caps lock"
* commit 'beac24226b6a6303ff1821cf0ad57f146bb0e3d7':
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(); |