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

Commit 32d7ad08 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Automerger Merge Worker
Browse files

Merge "Align the lockscreen shortcuts haptics with the animation" into udc-dev am: d8d6ce33 

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



Change-Id: I63970d3b1ea6b758c8325d5f942a2a8bdfe58c01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1acd0a5 d8d6ce33

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaVibrations.kt

+3 −1
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ object KeyguardBottomAreaVibrations { 
        VibrationEffect.startComposition()

            .apply {

                val vibrationDelayMs =

                    (ShakeAnimationDuration.inWholeMilliseconds / ShakeAnimationCycles * 2).toInt()

                    (ShakeAnimationDuration.inWholeMilliseconds / (ShakeAnimationCycles * 2))

                    .toInt()



                val vibrationCount = ShakeAnimationCycles.toInt() * 2

                repeat(vibrationCount) {

                    addPrimitive(