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

Commit ef9913ad authored by Lais Andrade's avatar Lais Andrade Committed by Automerger Merge Worker
Browse files

Merge "Use a fallback vibration effect for GESTURE_END" am: 12ffac17 am:... 

Merge "Use a fallback vibration effect for GESTURE_END" am: 12ffac17 am: 777b5e12 am: e5457de8 am: c90aab51

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675891

Change-Id: Ia232d09fadf031d6dc140bd0939a9782127f79d3
parents 7bc40430 c90aab51

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

+1 −1
Original line number Diff line number Diff line
@@ -5130,6 +5130,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        long[] pattern;

        switch (effectId) {

            case HapticFeedbackConstants.CONTEXT_CLICK:

            case HapticFeedbackConstants.GESTURE_END:

                return VibrationEffect.get(VibrationEffect.EFFECT_TICK);

            case HapticFeedbackConstants.TEXT_HANDLE_MOVE:

                if (!mHapticTextHandleEnabled) {
@@ -5142,7 +5143,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            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: