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

Commit f4a35f2a authored by Shivangi Dubey's avatar Shivangi Dubey Committed by Automerger Merge Worker
Browse files

Merge "Changed VibrationAttributes of Unfold Haptics" into udc-dev am: 1cd1081f 

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



Change-Id: If2db475dcb52a5ddcfcf0cdf9d481a29e8ea8a88
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d649627c 1cd1081f

packages/SystemUI/src/com/android/systemui/unfold/UnfoldHapticsPlayer.kt

+4 −1
Original line number Diff line number Diff line 
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

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

+5 −4
Original line number Diff line number Diff line
@@ -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>())

    }

}