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

Commit fa397699 authored by Lais Andrade's avatar Lais Andrade
Browse files

Revert notification haptics to previous patterns 

Remove the new PWLE effect being used for notification vibrations on
devices with frequency control. Feature will need UX revision.

Fix: 191734745
Test: manual
Change-Id: I10aea954f4e7c6ef0634fe60f0308039a16f5c52
parent d4c591c7

services/core/java/com/android/server/notification/VibratorHelper.java

+0 −24
Original line number Original line Diff line number Diff line
@@ -102,9 +102,6 @@ public final class VibratorHelper { 
     * @param insistent {@code true} if the vibration should loop until it is cancelled.

     * @param insistent {@code true} if the vibration should loop until it is cancelled.

     */

     */

    public VibrationEffect createFallbackVibration(boolean insistent) {

    public VibrationEffect createFallbackVibration(boolean insistent) {

        if (mVibrator.hasFrequencyControl()) {

            return createChirpVibration(insistent);

        }

        return createWaveformVibration(mFallbackPattern, insistent);

        return createWaveformVibration(mFallbackPattern, insistent);

    }

    }
@@ -114,30 +111,9 @@ public final class VibratorHelper { 
     * @param insistent {@code true} if the vibration should loop until it is cancelled.

     * @param insistent {@code true} if the vibration should loop until it is cancelled.

     */

     */

    public VibrationEffect createDefaultVibration(boolean insistent) {

    public VibrationEffect createDefaultVibration(boolean insistent) {

        if (mVibrator.hasFrequencyControl()) {

            return createChirpVibration(insistent);

        }

        return createWaveformVibration(mDefaultPattern, insistent);

        return createWaveformVibration(mDefaultPattern, insistent);

    }

    }





    private static VibrationEffect createChirpVibration(boolean insistent) {

        VibrationEffect.WaveformBuilder waveformBuilder = VibrationEffect.startWaveform()

                .addStep(/* amplitude= */ 0, /* frequency= */ -0.85f, /* duration= */ 0)

                .addRamp(/* amplitude= */ 1, /* frequency= */ -0.25f, /* duration= */ 100)

                .addStep(/* amplitude= */ 1, /* duration= */ 150)

                .addRamp(/* amplitude= */ 0, /* frequency= */ -0.85f, /* duration= */ 250);



        if (insistent) {

            return waveformBuilder.build(/* repeat= */ 0);

        }



        VibrationEffect singleBeat = waveformBuilder.build();

        return VibrationEffect.startComposition()

                .addEffect(singleBeat)

                .addEffect(singleBeat)

                .compose();

    }



    private static long[] getLongArray(Resources resources, int resId, int maxLength, long[] def) {

    private static long[] getLongArray(Resources resources, int resId, int maxLength, long[] def) {

        int[] ar = resources.getIntArray(resId);

        int[] ar = resources.getIntArray(resId);

        if (ar == null) {

        if (ar == null) {