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

Commit 110c7484 authored by Jason Mylen's avatar Jason Mylen Committed by Automerger Merge Worker
Browse files

Merge "Remove conflicting vibration-only haptic causing inconsistent touch... 

Merge "Remove conflicting vibration-only haptic causing inconsistent touch feedback." into tm-qpr-dev am: b4c05895

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



Change-Id: Id23f6b3c8f9aaf5d1b8972184ffe7a4022d9b7d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4936de71 b4c05895

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -1230,6 +1230,9 @@ public class VolumeDialogImpl implements VolumeDialog, 
                effect = VibrationEffect.get(VibrationEffect.EFFECT_CLICK);

                break;

            case RINGER_MODE_VIBRATE:

                // Feedback handled by onStateChange, for feedback both when user toggles

                // directly in volume dialog, or drags slider to a value of 0 in settings.

                break;

            default:

                effect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);

        }
@@ -1630,9 +1633,8 @@ public class VolumeDialogImpl implements VolumeDialog, 
                && mState.ringerModeInternal != -1

                && mState.ringerModeInternal != state.ringerModeInternal

                && state.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) {

            mController.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK));

            mController.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK));

        }



        mState = state;

        mDynamic.clear();

        // add any new dynamic rows