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

Commit e81b500d authored by Alexey Kuzmin's avatar Alexey Kuzmin
Browse files

Mapping of haptic constants updated 

Bug: 74882420
Test: Haptic effects should correspond to UI effects as it's written in
docs

Change-Id: I6bf041775aa0ee2f7903b9e7ef794a75f011bd2f
parent cd0d27ad

services/core/java/com/android/server/policy/PhoneWindowManager.java

+21 −15
Original line number Original line Diff line number Diff line
@@ -8003,29 +8003,35 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    private VibrationEffect getVibrationEffect(int effectId) {

    private VibrationEffect getVibrationEffect(int effectId) {

        long[] pattern;

        long[] pattern;

        switch (effectId) {

        switch (effectId) {

            case HapticFeedbackConstants.LONG_PRESS:

                pattern = mLongPressVibePattern;

                break;

            case HapticFeedbackConstants.CLOCK_TICK:

            case HapticFeedbackConstants.CLOCK_TICK:

            case HapticFeedbackConstants.CONTEXT_CLICK:

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

            case HapticFeedbackConstants.KEYBOARD_RELEASE:

            case HapticFeedbackConstants.TEXT_HANDLE_MOVE:

            case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE:

            case HapticFeedbackConstants.ENTRY_BUMP:

            case HapticFeedbackConstants.DRAG_CROSSING:

            case HapticFeedbackConstants.GESTURE_END:

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK, false);

            case HapticFeedbackConstants.KEYBOARD_TAP: // == KEYBOARD_PRESS

            case HapticFeedbackConstants.VIRTUAL_KEY:

            case HapticFeedbackConstants.EDGE_RELEASE:

            case HapticFeedbackConstants.CONFIRM:

            case HapticFeedbackConstants.GESTURE_START:

                return VibrationEffect.get(VibrationEffect.EFFECT_CLICK);

            case HapticFeedbackConstants.LONG_PRESS:

            case HapticFeedbackConstants.EDGE_SQUEEZE:

                return VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK);

            case HapticFeedbackConstants.REJECT:

                return VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);



            case HapticFeedbackConstants.CALENDAR_DATE:

            case HapticFeedbackConstants.CALENDAR_DATE:

                pattern = mCalendarDateVibePattern;

                pattern = mCalendarDateVibePattern;

                break;

                break;

            case HapticFeedbackConstants.SAFE_MODE_ENABLED:

            case HapticFeedbackConstants.SAFE_MODE_ENABLED:

                pattern = mSafeModeEnabledVibePattern;

                pattern = mSafeModeEnabledVibePattern;

                break;

                break;

            case HapticFeedbackConstants.CONTEXT_CLICK:



                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

            case HapticFeedbackConstants.VIRTUAL_KEY:

                return VibrationEffect.get(VibrationEffect.EFFECT_CLICK);

            case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE:

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK, false);

            case HapticFeedbackConstants.KEYBOARD_PRESS:  // == HapticFeedbackConstants.KEYBOARD_TAP

                return VibrationEffect.get(VibrationEffect.EFFECT_CLICK);

            case HapticFeedbackConstants.KEYBOARD_RELEASE:

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK, false);

            case HapticFeedbackConstants.TEXT_HANDLE_MOVE:

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK, false);

            default:

            default:

                return null;

                return null;

        }

        }