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

Commit 170c34a6 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Add the alternate bouncer as its own window" into main

parents c59d69f3 01431320

packages/SystemUI/res-keyguard/layout/alternate_bouncer.xml

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ 
    android:focusable="true"

    android:clickable="true"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:visibility="invisible">

    android:layout_height="match_parent">



    <com.android.systemui.scrim.ScrimView

        android:id="@+id/alternate_bouncer_scrim"

packages/SystemUI/res/layout/super_notification_shade.xml

+0 −4
Original line number Diff line number Diff line
@@ -120,10 +120,6 @@ 
        android:inflatedId="@+id/multi_shade"

        android:layout="@layout/multi_shade" />



    <include layout="@layout/alternate_bouncer"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <com.android.systemui.biometrics.AuthRippleView

        android:id="@+id/auth_ripple"

        android:layout_width="match_parent"

packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.systemui.biometrics.udfps.EllipseOverlapDetector 
import com.android.systemui.biometrics.udfps.OverlapDetector

import com.android.systemui.biometrics.ui.binder.SideFpsOverlayViewBinder

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.ui.binder.AlternateBouncerViewBinder

import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener

import com.android.systemui.util.concurrency.ThreadFactory

import dagger.Binds
@@ -69,6 +70,11 @@ interface BiometricsModule { 
    @ClassKey(SideFpsOverlayViewBinder::class)

    fun bindsSideFpsOverlayViewBinder(viewBinder: SideFpsOverlayViewBinder): CoreStartable



    @Binds

    @IntoMap

    @ClassKey(AlternateBouncerViewBinder::class)

    fun bindAlternateBouncerViewBinder(viewBinder: AlternateBouncerViewBinder): CoreStartable



    @Binds

    @SysUISingleton

    fun faceSettings(impl: FaceSettingsRepositoryImpl): FaceSettingsRepository

packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/DeviceEntryUdfpsTouchOverlayViewModel.kt

+5 −10
Original line number Diff line number Diff line
@@ -38,19 +38,14 @@ constructor( 
    alternateBouncerInteractor: AlternateBouncerInteractor,

    systemUIDialogManager: SystemUIDialogManager,

) : UdfpsTouchOverlayViewModel {

    private val showingUdfpsAffordance: Flow<Boolean> =

    override val shouldHandleTouches: Flow<Boolean> =

        combine(

            deviceEntryIconViewModel.deviceEntryViewAlpha,

            alternateBouncerInteractor.isVisible,

        ) { deviceEntryViewAlpha, alternateBouncerVisible ->

            deviceEntryViewAlpha > ALLOW_TOUCH_ALPHA_THRESHOLD || alternateBouncerVisible

        }

    override val shouldHandleTouches: Flow<Boolean> =

        combine(

            showingUdfpsAffordance,

            systemUIDialogManager.hideAffordancesRequest,

        ) { showingUdfpsAffordance, dialogRequestingHideAffordances ->

            showingUdfpsAffordance && !dialogRequestingHideAffordances

            systemUIDialogManager.hideAffordancesRequest

        ) { deviceEntryViewAlpha, alternateBouncerVisible, hideAffordancesRequest ->

            (deviceEntryViewAlpha > ALLOW_TOUCH_ALPHA_THRESHOLD && !hideAffordancesRequest) ||

                alternateBouncerVisible

        }



    companion object {

packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ constructor( 
    var receivedDownTouch = false

    val isVisible: Flow<Boolean> = bouncerRepository.alternateBouncerVisible

    private val alternateBouncerUiAvailableFromSource: HashSet<String> = HashSet()

    private val alternateBouncerSupported: StateFlow<Boolean> =

    val alternateBouncerSupported: StateFlow<Boolean> =

        if (DeviceEntryUdfpsRefactor.isEnabled) {

            fingerprintPropertyRepository.sensorType

                .map { sensorType -> sensorType.isUdfps() || sensorType.isPowerButton() }