am beac2422: Merge "Add haptic feedback for caps lock"

* commit 'beac24226b6a6303ff1821cf0ad57f146bb0e3d7':
  Add haptic feedback for caps lock
This commit is contained in:
Tadashi G. Takaoka 2011-10-07 05:46:31 -07:00 committed by Android Git Automerger
commit 158f1cce3d
2 changed files with 2 additions and 1 deletions

View file

@ -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() {

View file

@ -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();