Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shivangi Dubey
2023-06-01 14:26:29 +00:00
committed by Android (Google) Code Review
parent f7cbf38e4c 7115464557
commit 1cd1081fa1
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/unfold/UnfoldHapticsPlayer.kt
View File

@@ -1,6 +1,7 @@
package com.android.systemui.unfold package com.android.systemui.unfold
import android.os.SystemProperties import android.os.SystemProperties
import android.os.VibrationAttributes
import android.os.VibrationEffect import android.os.VibrationEffect
import android.os.Vibrator import android.os.Vibrator
import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dagger.qualifiers.Main
@@ -22,6 +23,8 @@ constructor(
) : TransitionProgressListener { ) : TransitionProgressListener {
private var isFirstAnimationAfterUnfold = false private var isFirstAnimationAfterUnfold = false
private val touchVibrationAttributes =
VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK)
init { init {
if (vibrator != null) { if (vibrator != null) {
@@ -71,7 +74,7 @@ constructor(
} }
private fun playHaptics() { private fun playHaptics() {
vibrator?.vibrate(effect) vibrator?.vibrate(effect, touchVibrationAttributes)
} }
private val hapticsScale: Float private val hapticsScale: Float

9
packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldHapticsPlayerTest.kt
View File

@@ -15,6 +15,7 @@
*/ */
package com.android.systemui.unfold package com.android.systemui.unfold
import android.os.VibrationAttributes
import android.os.VibrationEffect import android.os.VibrationEffect
import android.os.Vibrator import android.os.Vibrator
import android.testing.AndroidTestingRunner import android.testing.AndroidTestingRunner
@@ -53,7 +54,7 @@ class UnfoldHapticsPlayerTest : SysuiTestCase() {
progressProvider.onTransitionProgress(0.5f) progressProvider.onTransitionProgress(0.5f)
progressProvider.onTransitionFinishing() progressProvider.onTransitionFinishing()
verify(vibrator).vibrate(any<VibrationEffect>()) verify(vibrator).vibrate(any<VibrationEffect>(), any<VibrationAttributes>())
} }
@Test @Test
@@ -64,7 +65,7 @@ class UnfoldHapticsPlayerTest : SysuiTestCase() {
progressProvider.onTransitionProgress(0.99f) progressProvider.onTransitionProgress(0.99f)
progressProvider.onTransitionFinishing() progressProvider.onTransitionFinishing()
verify(vibrator, never()).vibrate(any<VibrationEffect>()) verify(vibrator, never()).vibrate(any<VibrationEffect>(), any<VibrationAttributes>())
} }
@Test @Test
@@ -84,7 +85,7 @@ class UnfoldHapticsPlayerTest : SysuiTestCase() {
progressProvider.onTransitionFinished() progressProvider.onTransitionFinished()
testFoldProvider.onFoldUpdate(isFolded = true) testFoldProvider.onFoldUpdate(isFolded = true)
verify(vibrator, never()).vibrate(any<VibrationEffect>()) verify(vibrator, never()).vibrate(any<VibrationEffect>(), any<VibrationAttributes>())
} }
@Test @Test
@@ -112,6 +113,6 @@ class UnfoldHapticsPlayerTest : SysuiTestCase() {
progressProvider.onTransitionFinishing() progressProvider.onTransitionFinishing()
progressProvider.onTransitionFinished() progressProvider.onTransitionFinished()
verify(vibrator).vibrate(any<VibrationEffect>()) verify(vibrator).vibrate(any<VibrationEffect>(), any<VibrationAttributes>())
} }
} }