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

sanders: LineageActions: Haptic improvements

Browse Source
This commit is contained in:
jhenrique09
2017-11-21 20:07:00 -02:00
committed by therootlord
parent 552aa26a6c
commit c279e24bd6
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,6 @@ public class KeyHandler implements DeviceKeyHandler {
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
.build(); .build();
private static final long[] LONG_PRESS_VIBRATION_PATTERN = new long[] {0, 25, 10};
private final Context mContext; private final Context mContext;
private final PowerManager mPowerManager; private final PowerManager mPowerManager;
WakeLock mProximityWakeLock; WakeLock mProximityWakeLock;
@@ -530,11 +529,12 @@ public class KeyHandler implements DeviceKeyHandler {
if (isDoubleTap && action != ACTION_CAMERA && action != ACTION_FLASHLIGHT) { if (isDoubleTap && action != ACTION_CAMERA && action != ACTION_FLASHLIGHT) {
isHapticFeedbackEnabledOnFP = false; isHapticFeedbackEnabledOnFP = false;
} }
if (isHapticFeedbackEnabledOnFP && (action == ACTION_CAMERA || action == ACTION_FLASHLIGHT)) { if (isHapticFeedbackEnabledOnFP){
vibrate(action == ACTION_CAMERA ? 500 : 250); if (action == ACTION_CAMERA || action == ACTION_FLASHLIGHT) {
} vibrate(action == ACTION_CAMERA ? 500 : 250);
if (isHapticFeedbackEnabledOnFP && action == ACTION_POWER) { }else if (action != ACTION_VOICE_ASSISTANT) {
doHapticFeedbackFP(false); doHapticFeedbackFP(false);
}
} }
switch (action) { switch (action) {
case ACTION_HOME: case ACTION_HOME:
@@ -593,9 +593,6 @@ public class KeyHandler implements DeviceKeyHandler {
} }
break; break;
} }
if (isHapticFeedbackEnabledOnFP && action != ACTION_VOICE_ASSISTANT && action != ACTION_CAMERA && action != ACTION_FLASHLIGHT && action != ACTION_POWER) { // prevent double vibration
doHapticFeedbackFP(false);
}
} }
private void vibrate(int intensity) { private void vibrate(int intensity) {
@@ -804,12 +801,16 @@ public class KeyHandler implements DeviceKeyHandler {
} }
if (isHapticFeedbackEnabledOnFP()) { if (isHapticFeedbackEnabledOnFP()) {
int owningUid; mHandler.post(new Runnable() {
String owningPackage; public void run() {
owningUid = android.os.Process.myUid(); int owningUid;
owningPackage = mContext.getOpPackageName(); String owningPackage;
VibrationEffect effect = longpress ? VibrationEffect.createWaveform(LONG_PRESS_VIBRATION_PATTERN, -1) : VibrationEffect.get(VibrationEffect.EFFECT_CLICK); owningUid = android.os.Process.myUid();
mVibrator.vibrate(owningUid, owningPackage, effect, VIBRATION_ATTRIBUTES); owningPackage = mContext.getOpPackageName();
VibrationEffect effect = VibrationEffect.createOneShot(longpress ? 50 : 40, VibrationEffect.DEFAULT_AMPLITUDE);
mVibrator.vibrate(owningUid, owningPackage, effect, VIBRATION_ATTRIBUTES);
}
});
} }
} }