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

Commit 0740f70d authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cd_use_main" into main 

* changes:
  Annotate remaining shade and notification classes
  Annotate resources in biometrics package
  Replace GlobalConfig with Main for ShadeDisplayAwareDetector
  Provide @Main decorated context for the default display
  Replace @GlobalConfig with @Main
parents f0b78a46 f2a58002

packages/SystemUI/checks/src/com/android/internal/systemui/lint/ShadeDisplayAwareDetector.kt

+3 −6
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ class ShadeDisplayAwareDetector : Detector(), SourceCodeScanner { 
        private const val INJECT_ANNOTATION = "javax.inject.Inject"

        private const val APPLICATION_ANNOTATION =

            "com.android.systemui.dagger.qualifiers.Application"

        private const val GLOBAL_CONFIG_ANNOTATION = "com.android.systemui.common.ui.GlobalConfig"

        private const val SHADE_DISPLAY_AWARE_ANNOTATION =

            "com.android.systemui.shade.ShadeDisplayAware"

        private const val MAIN_ANNOTATION = "com.android.systemui.dagger.qualifiers.Main"



        private const val CONTEXT = "android.content.Context"

        private const val WINDOW_MANAGER = "android.view.WindowManager"
@@ -108,13 +108,10 @@ class ShadeDisplayAwareDetector : Detector(), SourceCodeScanner { 


            // check if the parameter is a context-dependent class relevant to shade

            if (className !in CONTEXT_DEPENDENT_SHADE_CLASSES) return false

            // check if it has @ShadeDisplayAware

            if (hasAnnotation(SHADE_DISPLAY_AWARE_ANNOTATION)) return false

            if (hasAnnotation(SHADE_DISPLAY_AWARE_ANNOTATION) || hasAnnotation(MAIN_ANNOTATION))

                return false

            // check if its a @Application-annotated Context

            if (className == CONTEXT && hasAnnotation(APPLICATION_ANNOTATION)) return false

            // check if its a @GlobalConfig-annotated ConfigurationState, ConfigurationController

            // or ConfigurationInteractor

            if (className in CONFIG_CLASSES && hasAnnotation(GLOBAL_CONFIG_ANNOTATION)) return false



            return true

        }

packages/SystemUI/checks/tests/com/android/internal/systemui/lint/ShadeDisplayAwareDetectorTest.kt

+7 −7
Original line number Diff line number Diff line
@@ -73,12 +73,12 @@ class ShadeDisplayAwareDetectorTest : SystemUILintDetectorTest() { 
            )

            .indented()



    private val globalConfigStub: TestFile =

    private val mainStub: TestFile =

        kotlin(

                """

                package com.android.systemui.common.ui

                package com.android.systemui.dagger.qualifiers



                @Retention(AnnotationRetention.RUNTIME) annotation class GlobalConfig

                @Retention(AnnotationRetention.RUNTIME) annotation class Main

                """

            )

            .indented()
@@ -119,7 +119,7 @@ class ShadeDisplayAwareDetectorTest : SystemUILintDetectorTest() { 
            qsContext,

            shadeDisplayAwareStub,

            applicationStub,

            globalConfigStub,

            mainStub,

            configStateStub,

            configControllerStub,

            configInteractorStub,
@@ -308,7 +308,7 @@ class ShadeDisplayAwareDetectorTest : SystemUILintDetectorTest() { 
    }



    @Test

    fun injectedConstructor_inRelevantPackage_withGlobalConfigAnnotatedConfigurationClass() {

    fun injectedConstructor_inRelevantPackage_withMainAnnotatedConfigurationClass() {

        lint()

            .files(

                TestFiles.kotlin(
@@ -317,11 +317,11 @@ class ShadeDisplayAwareDetectorTest : SystemUILintDetectorTest() { 


                        import javax.inject.Inject

                        import com.android.systemui.common.ui.ConfigurationState

                        import com.android.systemui.common.ui.GlobalConfig

                        import com.android.systemui.dagger.qualifiers.Main



                        class ExampleClass

                            @Inject

                            constructor(@GlobalConfig private val configState: ConfigurationState)

                            constructor(@Main private val configState: ConfigurationState)

                    """

                        .trimIndent()

                ),

packages/SystemUI/lint-baseline.xml

+1 −0
Original line number Diff line number Diff line
@@ -33959,5 +33959,6 @@ 
            file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractor.kt"

            line="53"

            column="5"/>

    </issue>















</issues>

























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



+2
−2






























Original line number
Diff line number
Diff line








@@ -714,12 +714,12 @@ public class AuthController implements













        onDialogDismissed(reason);















    }















    @Inject













    public AuthController(Context context,













    public AuthController(@Main Context context,















            @Application CoroutineScope applicationCoroutineScope,















            Execution execution,















            CommandQueue commandQueue,















            ActivityTaskManager activityTaskManager,













            @NonNull WindowManager windowManager,













            @NonNull @Main WindowManager windowManager,















            @Nullable FingerprintManager fingerprintManager,















            @Nullable FaceManager faceManager,















            Optional<AuthContextPlugins> contextPlugins,

































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



+3
−2






























Original line number
Diff line number
Diff line








@@ -36,6 +36,7 @@ import com.android.systemui.Flags.lightRevealMigration













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















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















import com.android.systemui.dagger.SysUISingleton













import com.android.systemui.dagger.qualifiers.Main















import com.android.systemui.deviceentry.domain.interactor.AuthRippleInteractor















import com.android.systemui.keyguard.WakefulnessLifecycle















import com.android.systemui.keyguard.shared.model.BiometricUnlockSource










@@ -69,9 +70,9 @@ import javax.inject.Provider













class AuthRippleController















@Inject















constructor(













    private val sysuiContext: Context,













    @Main private val sysuiContext: Context,















    private val authController: AuthController,













    private val configurationController: ConfigurationController,













    @Main private val configurationController: ConfigurationController,















    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,















    private val keyguardStateController: KeyguardStateController,















    private val wakefulnessLifecycle: WakefulnessLifecycle,