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

Commit 47a857bc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enforce falsing for long press and double tap." into main

parents 919d5199 dcad68d5

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardTouchHandlingViewModel.kt

+12 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsIntera 
import com.android.systemui.keyguard.domain.interactor.KeyguardTouchHandlingInteractor

import com.android.systemui.lifecycle.ExclusiveActivatable

import com.android.systemui.lifecycle.Hydrator

import com.android.systemui.plugins.FalsingManager

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.google.android.msdl.data.model.MSDLToken

import com.google.android.msdl.domain.MSDLPlayer

import dagger.assisted.AssistedFactory
@@ -39,6 +41,7 @@ class KeyguardTouchHandlingViewModel 
constructor(

    private val interactor: KeyguardTouchHandlingInteractor,

    private val msdlPlayer: MSDLPlayer,

    private val falsingManager: FalsingManager,

    deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor,

) : ExclusiveActivatable() {

    private val hydrator = Hydrator("KeyguardTouchHandlingViewModel.hydrator")
@@ -86,6 +89,14 @@ constructor( 
     * @param isA11yAction: Whether the action was performed as an a11y action

     */

    fun onLongPress(isA11yAction: Boolean) {

        if (

            SceneContainerFlag.isEnabled &&

                !isA11yAction &&

                falsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)

        ) {

            return

        }



        if (Flags.msdlFeedback()) {

            msdlPlayer.playToken(MSDLToken.LONG_PRESS)

        }
@@ -107,6 +118,7 @@ constructor( 


    /** Notifies that the lockscreen has been double clicked. */

    fun onDoubleClick() {

        if (SceneContainerFlag.isEnabled && falsingManager.isFalseDoubleTap()) return

        interactor.onDoubleClick()

    }

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardLongPressViewModelKosmos.kt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.keyguard.ui.viewmodel



import com.android.systemui.classifier.falsingManager

import com.android.systemui.deviceentry.domain.interactor.deviceEntryUdfpsInteractor

import com.android.systemui.haptics.msdl.msdlPlayer

import com.android.systemui.keyguard.domain.interactor.keyguardTouchHandlingInteractor
@@ -26,6 +27,7 @@ val Kosmos.keyguardTouchHandlingViewModel by 
        KeyguardTouchHandlingViewModel(

            interactor = keyguardTouchHandlingInteractor,

            msdlPlayer = msdlPlayer,

            falsingManager = falsingManager,

            deviceEntryUdfpsInteractor = deviceEntryUdfpsInteractor,

        )

    }

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardTouchHandlingViewModelFactoryKosmos.kt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.keyguard.ui.viewmodel



import com.android.systemui.classifier.falsingManager

import com.android.systemui.deviceentry.domain.interactor.deviceEntryUdfpsInteractor

import com.android.systemui.haptics.msdl.msdlPlayer

import com.android.systemui.keyguard.domain.interactor.keyguardTouchHandlingInteractor
@@ -28,6 +29,7 @@ val Kosmos.keyguardTouchHandlingViewModelFactory by 
                return KeyguardTouchHandlingViewModel(

                    keyguardTouchHandlingInteractor,

                    msdlPlayer,

                    falsingManager,

                    deviceEntryUdfpsInteractor,

                )

            }