diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2014-02-07 19:39:13 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit> | 2014-02-07 19:39:13 +0100 |
| commit | 75de542490f6a78f346c75fdea0bfc7975e6b4d2 (patch) | |
| tree | 13308f75330d0f61b3daa9f16e43425c59bef9f3 /gui/keyboard.cpp | |
| parent | Merge "Add haptic feedback" into android-4.4 (diff) | |
| parent | Expansion of vibrate options (diff) | |
| download | android_bootable_recovery-75de542490f6a78f346c75fdea0bfc7975e6b4d2.tar android_bootable_recovery-75de542490f6a78f346c75fdea0bfc7975e6b4d2.tar.gz android_bootable_recovery-75de542490f6a78f346c75fdea0bfc7975e6b4d2.tar.bz2 android_bootable_recovery-75de542490f6a78f346c75fdea0bfc7975e6b4d2.tar.lz android_bootable_recovery-75de542490f6a78f346c75fdea0bfc7975e6b4d2.tar.xz android_bootable_recovery-75de542490f6a78f346c75fdea0bfc7975e6b4d2.tar.zst android_bootable_recovery-75de542490f6a78f346c75fdea0bfc7975e6b4d2.zip | |
Diffstat (limited to 'gui/keyboard.cpp')
| -rw-r--r-- | gui/keyboard.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/keyboard.cpp b/gui/keyboard.cpp index 97a980a4e..36106c7c1 100644 --- a/gui/keyboard.cpp +++ b/gui/keyboard.cpp @@ -389,7 +389,6 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y) switch (state) { case TOUCH_START: - DataManager::Vibrate("tw_vibrate"); if (GetSelection(x, y) == 0) { startSelection = -1; was_held = 0; @@ -421,7 +420,6 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y) if (highlightRenderCount != 0) mRendered = false; highlightRenderCount = 0; - DataManager::Vibrate("tw_vibrate"); startSelection = 0; } break; @@ -478,6 +476,7 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y) startSelection = 0; break; } else if (state == TOUCH_RELEASE && was_held == 0) { + DataManager::Vibrate("tw_keyboard_vibrate"); if ((int)keyboard_keys[currentLayout - 1][rowIndex][indexx].key < KEYBOARD_SPECIAL_KEYS && (int)keyboard_keys[currentLayout - 1][rowIndex][indexx].key > 0) { // Regular key PageManager::NotifyKeyboard(keyboard_keys[currentLayout - 1][rowIndex][indexx].key); @@ -503,6 +502,7 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y) PageManager::NotifyKeyboard(keyboard_keys[currentLayout - 1][rowIndex][indexx].key); } else if ((int)keyboard_keys[currentLayout - 1][rowIndex][indexx].longpresskey < KEYBOARD_SPECIAL_KEYS && (int)keyboard_keys[currentLayout - 1][rowIndex][indexx].longpresskey > 0) { // Long Press Key + DataManager::Vibrate("tw_keyboard_vibrate"); PageManager::NotifyKeyboard(keyboard_keys[currentLayout - 1][rowIndex][indexx].longpresskey); } } else if (state == TOUCH_REPEAT) { |