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

Commit b7b8f290 authored by Michael Bestas's avatar Michael Bestas
Browse files

fixup! SystemUI: Add support for udfps dim layer 

Change-Id: Ib705ac06a125f12ea5a7c87ec06e0b4f72d637f3
parent 26e0242f

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+2 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
            mUdfpsOverlayInteractor.setRequestId(requestId);

            mFgExecutor.execute(() -> UdfpsController.this.showUdfpsOverlay(

                    new UdfpsControllerOverlay(

                        mContext,

                        mInflater,

                        mWindowManager,

                        mAccessibilityManager,
@@ -293,6 +294,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
                        mDeviceEntryUdfpsTouchOverlayViewModel,

                        mDefaultUdfpsTouchOverlayViewModel,

                        mPromptUdfpsTouchOverlayViewModel,

                        mShadeInteractor,

                        mUdfpsOverlayInteractor,

                        mPowerInteractor,

                        mScope

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.biometrics 


import android.annotation.SuppressLint

import android.annotation.UiThread

import android.content.Context

import android.graphics.PixelFormat

import android.graphics.Rect

import android.hardware.biometrics.BiometricRequestConstants.REASON_AUTH_BP
@@ -51,6 +52,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac 
import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.res.R

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.policy.KeyguardStateController

import dagger.Lazy

import kotlinx.coroutines.CoroutineScope
@@ -68,6 +70,7 @@ private const val TAG = "UdfpsControllerOverlay" 
@UiThread

class UdfpsControllerOverlay

constructor(

    private val context: Context,

    private val inflater: LayoutInflater,

    private val windowManager: WindowManager,

    private val accessibilityManager: AccessibilityManager,
@@ -82,6 +85,7 @@ constructor( 
    private val deviceEntryUdfpsTouchOverlayViewModel: Lazy<DeviceEntryUdfpsTouchOverlayViewModel>,

    private val defaultUdfpsTouchOverlayViewModel: Lazy<DefaultUdfpsTouchOverlayViewModel>,

    private val promptUdfpsTouchOverlayViewModel: Lazy<PromptUdfpsTouchOverlayViewModel>,

    private val shadeInteractor: ShadeInteractor,

    private val udfpsOverlayInteractor: UdfpsOverlayInteractor,

    private val powerInteractor: PowerInteractor,

    @Application private val scope: CoroutineScope,

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.power.domain.interactor.PowerInteractor 
import com.android.systemui.power.domain.interactor.powerInteractor

import com.android.systemui.power.shared.model.WakeSleepReason

import com.android.systemui.power.shared.model.WakefulnessState

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat
@@ -89,6 +90,7 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
    @Mock private lateinit var promptUdfpsTouchOverlayViewModel: PromptUdfpsTouchOverlayViewModel

    @Mock private lateinit var keyguardTransitionRepository: FakeKeyguardTransitionRepository

    private lateinit var keyguardTransitionInteractor: KeyguardTransitionInteractor

    @Mock private lateinit var shadeInteractor: ShadeInteractor

    @Mock private lateinit var udfpsOverlayInteractor: UdfpsOverlayInteractor

    private lateinit var powerRepository: FakePowerRepository

    private lateinit var powerInteractor: PowerInteractor
@@ -115,6 +117,7 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
    private fun withReason(@RequestReason reason: Int, block: () -> Unit = {}) {

        controllerOverlay =

            UdfpsControllerOverlay(

                context,

                inflater,

                windowManager,

                accessibilityManager,
@@ -129,6 +132,7 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
                { deviceEntryUdfpsTouchOverlayViewModel },

                { defaultUdfpsTouchOverlayViewModel },

                { promptUdfpsTouchOverlayViewModel },

                shadeInteractor,

                udfpsOverlayInteractor,

                powerInteractor,

                testScope,