Merge "Add haptic feedback for caps lock"

main
Tadashi G. Takaoka 2011-10-07 02:21:15 -07:00 committed by Android (Google) Code Review
commit beac24226b
2 changed files with 2 additions and 1 deletions

View File

@ -649,7 +649,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
} }
public boolean isVibrateAndSoundFeedbackRequired() { public boolean isVibrateAndSoundFeedbackRequired() {
return mKeyboardView == null || !mKeyboardView.isInSlidingKeyInput(); return mKeyboardView != null && !mKeyboardView.isInSlidingKeyInput();
} }
private int getPointerCount() { private int getPointerCount() {

View File

@ -1259,6 +1259,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
break; break;
case Keyboard.CODE_CAPSLOCK: case Keyboard.CODE_CAPSLOCK:
switcher.toggleCapsLock(); switcher.toggleCapsLock();
vibrate();
break; break;
case Keyboard.CODE_SHORTCUT: case Keyboard.CODE_SHORTCUT:
mSubtypeSwitcher.switchToShortcutIME(); mSubtypeSwitcher.switchToShortcutIME();