psmattas/device_motorola_sanders
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sanders: KeyHandler: Fix haptic on power action

Browse Source
This commit is contained in:
jhenrique09
2017-10-25 07:55:12 -02:00
committed by therootlord
parent e2e32dc9f7
commit 290dd03777
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
LineageActions/src/org/lineageos/settings/device/KeyHandler.java
View File

@@ -511,6 +511,9 @@ public class KeyHandler implements DeviceKeyHandler {
if (isHapticFeedbackEnabledOnFP && (action == ACTION_CAMERA || action == ACTION_FLASHLIGHT)) { if (isHapticFeedbackEnabledOnFP && (action == ACTION_CAMERA || action == ACTION_FLASHLIGHT)) {
vibrate(action == ACTION_CAMERA ? 500 : 250); vibrate(action == ACTION_CAMERA ? 500 : 250);
} }
if (isHapticFeedbackEnabledOnFP && action == ACTION_POWER) {
doHapticFeedbackFP(false);
}
switch (action) { switch (action) {
case ACTION_HOME: case ACTION_HOME:
if (!mKeyguardManager.inKeyguardRestrictedInputMode()) { if (!mKeyguardManager.inKeyguardRestrictedInputMode()) {
@@ -563,7 +566,7 @@ public class KeyHandler implements DeviceKeyHandler {
} }
break; break;
} }
if (isHapticFeedbackEnabledOnFP && action != ACTION_VOICE_ASSISTANT && action != ACTION_CAMERA && action != ACTION_FLASHLIGHT) { // prevent double vibration if (isHapticFeedbackEnabledOnFP && action != ACTION_VOICE_ASSISTANT && action != ACTION_CAMERA && action != ACTION_FLASHLIGHT && action != ACTION_POWER) { // prevent double vibration
doHapticFeedbackFP(false); doHapticFeedbackFP(false);
} }
} }
@@ -766,6 +769,9 @@ public class KeyHandler implements DeviceKeyHandler {
if (haptic && (action == ACTION_CAMERA || action == ACTION_FLASHLIGHT)) { if (haptic && (action == ACTION_CAMERA || action == ACTION_FLASHLIGHT)) {
vibrate(action == ACTION_CAMERA ? 500 : 250); vibrate(action == ACTION_CAMERA ? 500 : 250);
} }
if (haptic && action == ACTION_POWER){
doHapticFeedbackScreenOff();
}
switch (action) { switch (action) {
case ACTION_POWER: case ACTION_POWER:
toggleScreenState(); toggleScreenState();
@@ -798,7 +804,7 @@ public class KeyHandler implements DeviceKeyHandler {
openMessages(); openMessages();
break; break;
} }
if (action != ACTION_FLASHLIGHT && action != ACTION_CAMERA) { if (action != ACTION_FLASHLIGHT && action != ACTION_CAMERA && action != ACTION_POWER) {
doHapticFeedbackScreenOff(); doHapticFeedbackScreenOff();
} }
} }