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

Commit 3c7368d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b238333941" into tm-qpr-dev 

* changes:
  Move NotificationShadeWindowControllerImpl to the shade package
  Move ShadeController to the shade package
parents 673639d9 dfb6e719

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import androidx.annotation.Nullable; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.keyguard.dagger.KeyguardBouncerScope;

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

import com.android.systemui.shade.ShadeController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;

import com.android.systemui.util.EmergencyDialerConstants;

packages/SystemUI/src/com/android/systemui/Dependency.java

+1 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import com.android.systemui.qs.ReduceBrightColorsController; 
import com.android.systemui.qs.tiles.dialog.InternetDialogFactory;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.screenrecord.RecordingController;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shared.plugins.PluginManager;

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

import com.android.systemui.shared.system.DevicePolicyManagerWrapper;
@@ -104,7 +105,6 @@ import com.android.systemui.statusbar.phone.LockscreenGestureLogger; 
import com.android.systemui.statusbar.phone.ManagedProfileController;

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

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

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

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

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

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

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt

+13 −13
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ import com.android.systemui.dagger.qualifiers.Background 
import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.globalactions.GlobalActionsPopupMenu

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.statusbar.phone.ShadeController

import com.android.systemui.shade.ShadeController

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

import com.android.systemui.util.concurrency.DelayableExecutor

import dagger.Lazy

packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java

+3 −3
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ import com.android.systemui.qs.tileimpl.QSFactoryImpl; 
import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.screenshot.ReferenceScreenshotModule;

import com.android.systemui.shade.NotificationShadeWindowControllerImpl;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeControllerImpl;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;
@@ -57,9 +60,6 @@ import com.android.systemui.statusbar.phone.DozeServiceHost; 
import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

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

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

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

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

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

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

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.statusbar.policy.BatteryControllerImpl;

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+1 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.systemui.privacy.PrivacyModule; 
import com.android.systemui.recents.Recents;

import com.android.systemui.screenshot.dagger.ScreenshotModule;

import com.android.systemui.settings.dagger.MultiUserUtilsModule;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.smartspace.dagger.SmartspaceModule;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;
@@ -68,7 +69,6 @@ import com.android.systemui.statusbar.notification.row.dagger.ExpandableNotifica 
import com.android.systemui.statusbar.notification.row.dagger.NotificationRowComponent;

import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfComponent;

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

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

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent;

import com.android.systemui.statusbar.pipeline.dagger.StatusBarPipelineModule;

import com.android.systemui.statusbar.policy.HeadsUpManager;