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

Commit 58ea8ff0 authored by Beverly's avatar Beverly
Browse files

Use UdfpsOverlayInteractor.iconPadding for AltBouncerUdfps 

Test: manual
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor DEVELOPMENT
Bug: 316578369
Bug: 287599719
Change-Id: I6f1cd63705e2169ba7b5488e94d42c937b927c74
parent 2996824c

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

+3 −6
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ import android.content.Context 
import android.hardware.biometrics.SensorLocationInternal

import com.android.settingslib.Utils

import com.android.systemui.biometrics.data.repository.FingerprintPropertyRepository

import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor

import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor

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

import com.android.systemui.keyguard.ui.view.DeviceEntryIconView

import com.android.systemui.res.R

import javax.inject.Inject

import kotlin.math.roundToInt

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.combine
@@ -44,6 +44,7 @@ constructor( 
    configurationInteractor: ConfigurationInteractor,

    deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor,

    fingerprintPropertyRepository: FingerprintPropertyRepository,

    udfpsOverlayInteractor: UdfpsOverlayInteractor,

) {

    private val isSupported: Flow<Boolean> = deviceEntryUdfpsInteractor.isUdfpsSupported

    val iconLocation: Flow<IconLocation> =
@@ -72,11 +73,7 @@ constructor( 
            .onStart {

                emit(Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary))

            }

    private val fgIconPadding: Flow<Int> =

        configurationInteractor.scaleForResolution.map { scale ->

            (context.resources.getDimensionPixelSize(R.dimen.lock_icon_padding) * scale)

                .roundToInt()

        }

    private val fgIconPadding: Flow<Int> = udfpsOverlayInteractor.iconPadding

    val fgViewModel: Flow<DeviceEntryForegroundViewModel.ForegroundIconViewModel> =

        combine(

            fgIconColor,