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

Commit 52a7ca44 authored by Grace Cheng's avatar Grace Cheng
Browse files

Migrate SideFpsOverlay code to Kosmos 

Migrate SideFpsOverlayViewModel and SideFpsOverlayViewBinder tests to
Kosmos and add missing Kosmos classes for dependencies, and minor
cleanup (removing unused parameters in SideFpsOverlayViewBinder)

Flag: NONE
Bug: 335757373
Test: atest SideFpsOverlayViewBinderTest
Test: atest SideFpsOverlayViewModelTest
Change-Id: I2b17f37c4f8e96a6abc8b824c85718e00dfead63
parent 44443335

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinder.kt

+0 −2
Original line number Diff line number Diff line
@@ -122,11 +122,9 @@ constructor( 
        val overlayViewModel =

            SideFpsOverlayViewModel(

                applicationContext,

                biometricStatusInteractor.get(),

                deviceEntrySideFpsOverlayInteractor.get(),

                displayStateInteractor.get(),

                sfpsSensorInteractor.get(),

                sideFpsProgressBarViewModel.get()

            )

        bind(overlayView!!, overlayViewModel, fpsUnlockTracker.get(), windowManager.get())

        overlayView!!.visibility = View.INVISIBLE

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

+0 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.view.WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY 
import com.airbnb.lottie.model.KeyPath

import com.android.systemui.Flags.constraintBp

import com.android.systemui.biometrics.Utils

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

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

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

import com.android.systemui.biometrics.domain.model.SideFpsSensorLocation
@@ -38,7 +37,6 @@ import com.android.systemui.biometrics.shared.model.DisplayRotation 
import com.android.systemui.biometrics.shared.model.LottieCallback

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.keyguard.domain.interactor.DeviceEntrySideFpsOverlayInteractor

import com.android.systemui.keyguard.ui.viewmodel.SideFpsProgressBarViewModel

import com.android.systemui.res.R

import com.android.systemui.util.kotlin.sample

import javax.inject.Inject
@@ -54,11 +52,9 @@ class SideFpsOverlayViewModel 
@Inject

constructor(

    @Application private val applicationContext: Context,

    biometricStatusInteractor: BiometricStatusInteractor,

    deviceEntrySideFpsOverlayInteractor: DeviceEntrySideFpsOverlayInteractor,

    displayStateInteractor: DisplayStateInteractor,

    sfpsSensorInteractor: SideFpsSensorInteractor,

    sideFpsProgressBarViewModel: SideFpsProgressBarViewModel

) {

    /** Contains properties of the side fingerprint sensor indicator */

    data class OverlayViewProperties(

packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt

+56 −232

File changed.

Preview size limit exceeded, changes collapsed.

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

+61 −206

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/tests/utils/src/android/view/LayoutInflaterKosmos.kt

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ package android.view 
import android.content.applicationContext

import com.android.systemui.kosmos.Kosmos



val Kosmos.layoutInflater: LayoutInflater by

var Kosmos.layoutInflater: LayoutInflater by

    Kosmos.Fixture { LayoutInflater.from(applicationContext) }