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

Commit 675c35b7 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

For non-udfps devices, use lock_icon padding specified in pixels. 

Instead of using the udfps padding calculation.

Fixes: 319894241
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor DEVELOPMENT
Test: manually check lock icon on SFPS device
Change-Id: If24a5a67af184e093465b8128e974e6fc2dd0b3b
parent a2d78978

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

+13 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState 
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
@@ -74,7 +75,18 @@ constructor( 
                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(