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

Commit 11972181 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move Display-state related code to com.android.systemui.display package." into main

parents 3b9e146d aaf37d6f

packages/SystemUI/lint-baseline.xml

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ 
    <issue

        id="CleanArchitectureDependencyViolation"

        message="The data layer may not depend on the domain layer."

        errorLine1="import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor"

        errorLine1="import com.android.systemui.display.domain.interactor.DisplayStateInteractor"

        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt"

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractorImplTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ import com.android.systemui.biometrics.data.repository.FakePromptRepository 
import com.android.systemui.biometrics.faceSensorPropertiesInternal

import com.android.systemui.biometrics.fingerprintSensorPropertiesInternal

import com.android.systemui.biometrics.shared.model.BiometricModalities

import com.android.systemui.biometrics.shared.model.DisplayRotation

import com.android.systemui.biometrics.shared.model.PromptKind

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.display.data.repository.FakeDisplayRepository

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

import com.android.systemui.display.domain.interactor.DisplayStateInteractorImpl

import com.android.systemui.display.shared.model.DisplayRotation

import com.android.systemui.util.concurrency.FakeExecutor

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.whenever

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractorTest.kt

+16 −25
Original line number Diff line number Diff line
@@ -29,14 +29,15 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider

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

import com.android.systemui.biometrics.shared.model.DisplayRotation

import com.android.systemui.biometrics.shared.model.DisplayRotation.ROTATION_0

import com.android.systemui.biometrics.shared.model.DisplayRotation.ROTATION_180

import com.android.systemui.biometrics.shared.model.DisplayRotation.ROTATION_270

import com.android.systemui.biometrics.shared.model.DisplayRotation.ROTATION_90

import com.android.systemui.biometrics.shared.model.FingerprintSensorType

import com.android.systemui.biometrics.shared.model.SensorStrength

import com.android.systemui.coroutines.collectLastValue

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

import com.android.systemui.display.shared.model.DisplayRotation

import com.android.systemui.display.shared.model.DisplayRotation.ROTATION_0

import com.android.systemui.display.shared.model.DisplayRotation.ROTATION_180

import com.android.systemui.display.shared.model.DisplayRotation.ROTATION_270

import com.android.systemui.display.shared.model.DisplayRotation.ROTATION_90

import com.android.systemui.keyguard.data.repository.biometricSettingsRepository

import com.android.systemui.keyguard.data.repository.fakeBiometricSettingsRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
@@ -114,7 +115,7 @@ class SideFpsSensorInteractorTest : SysuiTestCase() { 
                Optional.of(fingerprintInteractiveToAuthProvider),

                kosmos.biometricSettingsRepository,

                kosmos.keyguardTransitionInteractor,

                SideFpsLogger(logcatLogBuffer("SfpsLogger"))

                SideFpsLogger(logcatLogBuffer("SfpsLogger")),

            )

    }
@@ -145,19 +146,15 @@ class SideFpsSensorInteractorTest : SysuiTestCase() { 
    private suspend fun sendTransition(from: KeyguardState, to: KeyguardState) {

        kosmos.fakeKeyguardTransitionRepository.sendTransitionSteps(

            listOf(

                TransitionStep(

                    from = from,

                    to = to,

                    transitionState = TransitionState.STARTED,

                ),

                TransitionStep(from = from, to = to, transitionState = TransitionState.STARTED),

                TransitionStep(

                    from = from,

                    to = to,

                    transitionState = TransitionState.FINISHED,

                    value = 1.0f

                )

                    value = 1.0f,

                ),

            ),

            testScope

            testScope,

        )

    }
@@ -440,7 +437,7 @@ class SideFpsSensorInteractorTest : SysuiTestCase() { 
        sensorLocationX: Int = 0,

        sensorLocationY: Int = 0,

        rotation: DisplayRotation,

        sensorWidth: Int

        sensorWidth: Int,

    ) {

        setupDisplayDimensions(width, height)

        currentRotation.value = rotation
@@ -448,7 +445,7 @@ class SideFpsSensorInteractorTest : SysuiTestCase() { 
            x = sensorLocationX,

            y = sensorLocationY,

            displayId = "expanded_display",

            sensorRadius = sensorWidth / 2

            sensorRadius = sensorWidth / 2,

        )

    }
@@ -467,7 +464,7 @@ class SideFpsSensorInteractorTest : SysuiTestCase() { 
        x: Int = 0,

        y: Int = 0,

        displayId: String = "display_id_1",

        sensorRadius: Int = 150

        sensorRadius: Int = 150,

    ) {

        contextDisplayInfo.uniqueId = displayId

        fingerprintRepository.setProperties(
@@ -483,14 +480,8 @@ class SideFpsSensorInteractorTest : SysuiTestCase() { 
                            y + 100,

                            sensorRadius,

                        ),

                    displayId to

                        SensorLocationInternal(

                            displayId,

                            x,

                            y,

                            sensorRadius,

                        )

                )

                    displayId to SensorLocationInternal(displayId, x, y, sensorRadius),

                ),

        )

        // Emit a display change event, this happens whenever any display related change happens,

        // rotation, active display changing etc, display switched off/on.

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

+1 −1
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ import com.android.systemui.biometrics.data.repository.biometricStatusRepository 
import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository

import com.android.systemui.biometrics.shared.model.AuthenticationReason

import com.android.systemui.biometrics.shared.model.AuthenticationReason.SettingsOperations

import com.android.systemui.biometrics.shared.model.DisplayRotation

import com.android.systemui.biometrics.shared.model.FingerprintSensorType

import com.android.systemui.biometrics.shared.model.SensorStrength

import com.android.systemui.biometrics.updateSfpsIndicatorRequests

import com.android.systemui.display.data.repository.displayRepository

import com.android.systemui.display.data.repository.displayStateRepository

import com.android.systemui.display.shared.model.DisplayRotation

import com.android.systemui.kosmos.testScope

import com.android.systemui.res.R

import com.android.systemui.testKosmos

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

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ import com.android.systemui.Flags 
import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider

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

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

import com.android.systemui.biometrics.shared.model.DisplayRotation

import com.android.systemui.biometrics.shared.model.FingerprintSensorType

import com.android.systemui.biometrics.shared.model.LottieCallback

import com.android.systemui.biometrics.shared.model.SensorStrength
@@ -45,6 +43,8 @@ import com.android.systemui.biometrics.updateSfpsIndicatorRequests 
import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.display.data.repository.displayRepository

import com.android.systemui.display.data.repository.displayStateRepository

import com.android.systemui.display.domain.interactor.displayStateInteractor

import com.android.systemui.display.shared.model.DisplayRotation

import com.android.systemui.kosmos.testScope

import com.android.systemui.res.R

import com.android.systemui.testKosmos