Merge "Changed VibrationAttributes of Unfold Haptics" into udc-dev

2 files changed, 9 insertions, 5 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldHapticsPlayer.kt b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldHapticsPlayer.kt
index 8214822f0335..1e73cb3b9b24 100644
--- a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldHapticsPlayer.kt
+++ b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldHapticsPlayer.kt
@@ -1,6 +1,7 @@
 package com.android.systemui.unfold
 
 import android.os.SystemProperties
+import android.os.VibrationAttributes
 import android.os.VibrationEffect
 import android.os.Vibrator
 import com.android.systemui.dagger.qualifiers.Main
@@ -22,6 +23,8 @@ constructor(
 ) : TransitionProgressListener {
 
     private var isFirstAnimationAfterUnfold = false
+    private val touchVibrationAttributes =
+            VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK)
 
     init {
         if (vibrator != null) {
@@ -71,7 +74,7 @@ constructor(
     }
 
     private fun playHaptics() {
-        vibrator?.vibrate(effect)
+        vibrator?.vibrate(effect, touchVibrationAttributes)
     }
 
     private val hapticsScale: Float
diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldHapticsPlayerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldHapticsPlayerTest.kt
index 3dec45b4ff9f..b9c7e6133669 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldHapticsPlayerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldHapticsPlayerTest.kt
@@ -15,6 +15,7 @@
  */
 package com.android.systemui.unfold
 
+import android.os.VibrationAttributes
 import android.os.VibrationEffect
 import android.os.Vibrator
 import android.testing.AndroidTestingRunner
@@ -53,7 +54,7 @@ class UnfoldHapticsPlayerTest : SysuiTestCase() {
         progressProvider.onTransitionProgress(0.5f)
         progressProvider.onTransitionFinishing()
 
-        verify(vibrator).vibrate(any<VibrationEffect>())
+        verify(vibrator).vibrate(any<VibrationEffect>(), any<VibrationAttributes>())
     }
 
     @Test
@@ -64,7 +65,7 @@ class UnfoldHapticsPlayerTest : SysuiTestCase() {
         progressProvider.onTransitionProgress(0.99f)
         progressProvider.onTransitionFinishing()
 
-        verify(vibrator, never()).vibrate(any<VibrationEffect>())
+        verify(vibrator, never()).vibrate(any<VibrationEffect>(), any<VibrationAttributes>())
     }
 
     @Test
@@ -84,7 +85,7 @@ class UnfoldHapticsPlayerTest : SysuiTestCase() {
         progressProvider.onTransitionFinished()
         testFoldProvider.onFoldUpdate(isFolded = true)
 
-        verify(vibrator, never()).vibrate(any<VibrationEffect>())
+        verify(vibrator, never()).vibrate(any<VibrationEffect>(), any<VibrationAttributes>())
     }
 
     @Test
@@ -112,6 +113,6 @@ class UnfoldHapticsPlayerTest : SysuiTestCase() {
         progressProvider.onTransitionFinishing()
         progressProvider.onTransitionFinished()
 
-        verify(vibrator).vibrate(any<VibrationEffect>())
+        verify(vibrator).vibrate(any<VibrationEffect>(), any<VibrationAttributes>())
     }
 }