Merge "For non-udfps devices, use lock_icon padding specified in pixels." into main

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

                isTransitionToAod && isUdfps

            }

            .distinctUntilChanged()

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

    private val padding: Flow<Int> =

        deviceEntryUdfpsInteractor.isUdfpsSupported.flatMapLatest { udfpsSupported ->

            if (udfpsSupported) {

                udfpsOverlayInteractor.iconPadding

            } else {

                configurationInteractor.scaleForResolution.map { scale ->

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

                        .roundToInt()

                }

            }

        }

    val viewModel: Flow<ForegroundIconViewModel> =

        combine(