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

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

Merge "Ensure Keyguard classes use display-aware context" into main

parents 1f5e0e12 ab93fff4

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepositoryImplTest.kt

+0 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,6 @@ class KeyguardSmartspaceRepositoryImplTest : SysuiTestCase() { 
        fakeSettings.userId = fakeUserTracker.userId

        fakeSettings.userId = fakeUserTracker.userId

        underTest =

        underTest =

            KeyguardSmartspaceRepositoryImpl(

            KeyguardSmartspaceRepositoryImpl(

                context = context,

                secureSettings = fakeSettings,

                secureSettings = fakeSettings,

                userTracker = fakeUserTracker,

                userTracker = fakeUserTracker,

                applicationScope = scope.backgroundScope,

                applicationScope = scope.backgroundScope,

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -310,7 +310,7 @@ class KeyguardTouchHandlingInteractorTest : SysuiTestCase() { 
        // read during initialization to set up flows. Maybe there is a better way to handle that.

        // read during initialization to set up flows. Maybe there is a better way to handle that.

        underTest =

        underTest =

            KeyguardTouchHandlingInteractor(

            KeyguardTouchHandlingInteractor(

                appContext = mContext,

                context = mContext,

                scope = testScope.backgroundScope,

                scope = testScope.backgroundScope,

                transitionInteractor = kosmos.keyguardTransitionInteractor,

                transitionInteractor = kosmos.keyguardTransitionInteractor,

                repository = keyguardRepository,

                repository = keyguardRepository,

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ constructor( 
    private val keyguardBlueprintViewModel: KeyguardBlueprintViewModel,

    private val keyguardBlueprintViewModel: KeyguardBlueprintViewModel,

    private val keyguardStatusViewComponentFactory: KeyguardStatusViewComponent.Factory,

    private val keyguardStatusViewComponentFactory: KeyguardStatusViewComponent.Factory,

    @ShadeDisplayAware private val configuration: ConfigurationState,

    @ShadeDisplayAware private val configuration: ConfigurationState,

    private val context: Context,

    @ShadeDisplayAware private val context: Context,

    private val keyguardIndicationController: KeyguardIndicationController,

    private val keyguardIndicationController: KeyguardIndicationController,

    private val shadeInteractor: ShadeInteractor,

    private val shadeInteractor: ShadeInteractor,

    private val interactionJankMonitor: InteractionJankMonitor,

    private val interactionJankMonitor: InteractionJankMonitor,

packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.dagger.SysUISingleton; 
import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

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

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

import com.android.systemui.res.R;

import com.android.systemui.res.R;

import com.android.systemui.shade.ShadeDisplayAware;

import com.android.systemui.util.time.SystemClock;

import com.android.systemui.util.time.SystemClock;





import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -91,7 +92,7 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe 




    @Inject

    @Inject

    public WakefulnessLifecycle(

    public WakefulnessLifecycle(

            Context context,

            @ShadeDisplayAware Context context,

            @Nullable IWallpaperManager wallpaperManagerService,

            @Nullable IWallpaperManager wallpaperManagerService,

            SystemClock systemClock,

            SystemClock systemClock,

            DumpManager dumpManager) {

            DumpManager dumpManager) {

packages/SystemUI/src/com/android/systemui/keyguard/WindowManagerOcclusionManager.kt

+2 −1
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState 
import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel

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

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

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

import com.android.systemui.res.R

import com.android.systemui.res.R

import com.android.systemui.shade.ShadeDisplayAware

import java.util.concurrent.Executor

import java.util.concurrent.Executor

import javax.inject.Inject

import javax.inject.Inject
@@ -83,7 +84,7 @@ constructor( 
    val activityTransitionAnimator: ActivityTransitionAnimator,

    val activityTransitionAnimator: ActivityTransitionAnimator,

    val keyguardViewController: dagger.Lazy<KeyguardViewController>,

    val keyguardViewController: dagger.Lazy<KeyguardViewController>,

    val powerInteractor: PowerInteractor,

    val powerInteractor: PowerInteractor,

    val context: Context,

    @ShadeDisplayAware val context: Context,

    val interactionJankMonitor: InteractionJankMonitor,

    val interactionJankMonitor: InteractionJankMonitor,

    @Main executor: Executor,

    @Main executor: Executor,

    val dreamingToLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel,

    val dreamingToLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel,