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

Commit 5cc2c23b authored by Justin Weir's avatar Justin Weir
Browse files

Move showAodUi to ShadeLockscreenInteractor 

Also moves ShadeLockscreenInteractor to the correct package.

Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Test: Updated and ran affected test
Bug: 303267342
Bug: 330311871
Change-Id: Icc130e34d047c1e079d6b194cae75feee899749a
parent 3bb6b83a

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import com.android.systemui.flags.FakeFeatureFlagsClassic; 
import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.keyguard.domain.interactor.DozeInteractor;

import com.android.systemui.shade.NotificationShadeWindowViewController;

import com.android.systemui.shade.ShadeLockscreenInteractor;

import com.android.systemui.shade.domain.interactor.ShadeLockscreenInteractor;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.StatusBarState;

packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.annotation.Nullable; 


import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.shade.ShadeLockscreenInteractor;

import com.android.systemui.shade.domain.interactor.ShadeLockscreenInteractor;

import com.android.systemui.statusbar.phone.BiometricUnlockController;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

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

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ import com.android.systemui.res.R; 
import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.shade.ShadeLockscreenInteractor;

import com.android.systemui.shade.domain.interactor.ShadeLockscreenInteractor;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationShadeDepthController;

packages/SystemUI/src/com/android/systemui/shade/ShadeEmptyImplModule.kt

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractorEmpt 
import com.android.systemui.shade.domain.interactor.ShadeBackActionInteractor

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

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

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

import dagger.Binds

import dagger.Module

packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.shade.domain.interactor.ShadeInteractor 
import com.android.systemui.shade.domain.interactor.ShadeInteractorImpl

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

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

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

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

import dagger.Binds

import dagger.Module