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

Commit ffeed61e authored Apr 26, 2024 by Treehugger Robot Committed by Android (Google) Code Review Apr 26, 2024

Merge "[SB][Misc] Move IconManager classes into their own files." into main

parents 8cf22a2f 03f9f8ad

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -78,9 +78,9 @@ import com.android.systemui.shade.ui.composable.ExpandedShadeHeader
		import com.android.systemui.shade.ui.composable.Shade
		import com.android.systemui.shade.ui.composable.ShadeHeader
		import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel
		import com.android.systemui.statusbar.phone.StatusBarIconController
		import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager
		import com.android.systemui.statusbar.phone.StatusBarLocation
		import com.android.systemui.statusbar.phone.ui.StatusBarIconController
		import com.android.systemui.statusbar.phone.ui.TintedIconManager
		import javax.inject.Inject
		import kotlin.math.roundToInt
		import kotlinx.coroutines.CoroutineScope

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -69,10 +69,10 @@ import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.shade.ui.composable.ShadeHeader.Dimensions.CollapsedHeight
		import com.android.systemui.shade.ui.composable.ShadeHeader.Values.ClockScale
		import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel
		import com.android.systemui.statusbar.phone.StatusBarIconController
		import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager
		import com.android.systemui.statusbar.phone.StatusBarLocation
		import com.android.systemui.statusbar.phone.StatusIconContainer
		import com.android.systemui.statusbar.phone.ui.StatusBarIconController
		import com.android.systemui.statusbar.phone.ui.TintedIconManager
		import com.android.systemui.statusbar.pipeline.mobile.ui.view.ModernShadeCarrierGroupMobileView
		import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.ShadeCarrierGroupMobileIconViewModel
		import com.android.systemui.statusbar.policy.Clock

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -82,9 +82,9 @@ import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.ui.composable.ComposableScene
		import com.android.systemui.shade.shared.model.ShadeMode
		import com.android.systemui.shade.ui.viewmodel.ShadeSceneViewModel
		import com.android.systemui.statusbar.phone.StatusBarIconController
		import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager
		import com.android.systemui.statusbar.phone.StatusBarLocation
		import com.android.systemui.statusbar.phone.ui.StatusBarIconController
		import com.android.systemui.statusbar.phone.ui.TintedIconManager
		import com.android.systemui.util.animation.MeasurementInput
		import javax.inject.Inject
		import javax.inject.Named

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@ import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.res.R;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.phone.StatusBarIconController;
		import com.android.systemui.statusbar.phone.StatusBarLocation;
		import com.android.systemui.statusbar.phone.ui.StatusBarIconController;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.tuner.TunerService;

packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ import com.android.systemui.qs.pipeline.data.repository.CustomTileAddedRepositor
		import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.phone.StatusBarIconController;
		import com.android.systemui.statusbar.phone.ui.StatusBarIconController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.util.concurrency.DelayableExecutor;