Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 063a1a3a authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by android-build-merger
Browse files

Merge "Respect one-shot click effect config in VibratorService" into oc-dev 

am: 95e55f50

Change-Id: I43e326ccc04534938c558f430ce4e2015347ac5e
parents cb556d0b 95e55f50

services/core/java/com/android/server/VibratorService.java

+7 −1
Original line number Diff line number Diff line
@@ -221,7 +221,13 @@ public class VibratorService extends IVibratorService.Stub 


        long[] clickEffectTimings = getLongIntArray(context.getResources(),

                com.android.internal.R.array.config_virtualKeyVibePattern);

        VibrationEffect clickEffect = VibrationEffect.createWaveform(clickEffectTimings, -1);

        VibrationEffect clickEffect;

        if (clickEffectTimings.length == 1) {

            clickEffect = VibrationEffect.createOneShot(

                    clickEffectTimings[0], VibrationEffect.DEFAULT_AMPLITUDE);

        } else {

            clickEffect = VibrationEffect.createWaveform(clickEffectTimings, -1);

        }

        VibrationEffect doubleClickEffect = VibrationEffect.createWaveform(

                new long[] {0, 30, 100, 30} /*timings*/, -1);