nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit 'beac24226b6a6303ff1821cf0ad57f146bb0e3d7':
  Add haptic feedback for caps lock
main
Tadashi G. Takaoka 2011-10-07 05:46:31 -07:00 committed by Android Git Automerger
parent 276174e543 beac24226b
commit 158f1cce3d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
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() {

1
java/src/com/android/inputmethod/latin/LatinIME.java
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();