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

Commit c1301ad7 authored Oct 05, 2021 by TreeHugger Robot Committed by Android (Google) Code Review Oct 05, 2021

Merge "Move NetworkController & friends to a connectivity package" into sc-v2-dev

parents 9bf6a6c8 79bc5d54

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,11 +60,11 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
	import com.android.systemui.shared.system.DevicePolicyManagerWrapper;		import com.android.systemui.shared.system.DevicePolicyManagerWrapper;
	import com.android.systemui.shared.system.TaskStackChangeListeners;		import com.android.systemui.shared.system.TaskStackChangeListeners;
	import com.android.systemui.shared.system.WindowManagerWrapper;		import com.android.systemui.shared.system.WindowManagerWrapper;
			import com.android.systemui.statusbar.connectivity.NetworkController;
	import com.android.systemui.statusbar.phone.AutoHideController;		import com.android.systemui.statusbar.phone.AutoHideController;
	import com.android.systemui.statusbar.phone.ConfigurationControllerImpl;		import com.android.systemui.statusbar.phone.ConfigurationControllerImpl;
	import com.android.systemui.statusbar.policy.ConfigurationController;		import com.android.systemui.statusbar.policy.ConfigurationController;
	import com.android.systemui.statusbar.policy.DataSaverController;		import com.android.systemui.statusbar.policy.DataSaverController;
	import com.android.systemui.statusbar.policy.NetworkController;
	import com.android.systemui.theme.ThemeOverlayApplier;		import com.android.systemui.theme.ThemeOverlayApplier;
	import com.android.systemui.util.leak.LeakDetector;		import com.android.systemui.util.leak.LeakDetector;
	import com.android.systemui.util.settings.SecureSettings;		import com.android.systemui.util.settings.SecureSettings;

packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -42,8 +42,8 @@ import com.android.systemui.dagger.qualifiers.Background;
	import com.android.systemui.dagger.qualifiers.Main;		import com.android.systemui.dagger.qualifiers.Main;
	import com.android.systemui.flags.FeatureFlags;		import com.android.systemui.flags.FeatureFlags;
	import com.android.systemui.plugins.ActivityStarter;		import com.android.systemui.plugins.ActivityStarter;
	import com.android.systemui.statusbar.policy.NetworkController;		import com.android.systemui.statusbar.connectivity.NetworkController;
	import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators;		import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators;
	import com.android.systemui.util.CarrierConfigTracker;		import com.android.systemui.util.CarrierConfigTracker;

	import java.util.function.Consumer;		import java.util.function.Consumer;

packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -51,13 +51,13 @@ import com.android.systemui.qs.QSDetailItems.Item;
	import com.android.systemui.qs.QSHost;		import com.android.systemui.qs.QSHost;
	import com.android.systemui.qs.logging.QSLogger;		import com.android.systemui.qs.logging.QSLogger;
	import com.android.systemui.qs.tileimpl.QSTileImpl;		import com.android.systemui.qs.tileimpl.QSTileImpl;
			import com.android.systemui.statusbar.connectivity.NetworkController;
			import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators;
	import com.android.systemui.statusbar.phone.SystemUIDialog;		import com.android.systemui.statusbar.phone.SystemUIDialog;
	import com.android.systemui.statusbar.policy.CastController;		import com.android.systemui.statusbar.policy.CastController;
	import com.android.systemui.statusbar.policy.CastController.CastDevice;		import com.android.systemui.statusbar.policy.CastController.CastDevice;
	import com.android.systemui.statusbar.policy.HotspotController;		import com.android.systemui.statusbar.policy.HotspotController;
	import com.android.systemui.statusbar.policy.KeyguardStateController;		import com.android.systemui.statusbar.policy.KeyguardStateController;
	import com.android.systemui.statusbar.policy.NetworkController;
	import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators;

	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.LinkedHashMap;		import java.util.LinkedHashMap;

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -56,11 +56,11 @@ import com.android.systemui.qs.QSHost;
	import com.android.systemui.qs.SignalTileView;		import com.android.systemui.qs.SignalTileView;
	import com.android.systemui.qs.logging.QSLogger;		import com.android.systemui.qs.logging.QSLogger;
	import com.android.systemui.qs.tileimpl.QSTileImpl;		import com.android.systemui.qs.tileimpl.QSTileImpl;
			import com.android.systemui.statusbar.connectivity.NetworkController;
			import com.android.systemui.statusbar.connectivity.NetworkController.IconState;
			import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators;
			import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback;
	import com.android.systemui.statusbar.phone.SystemUIDialog;		import com.android.systemui.statusbar.phone.SystemUIDialog;
	import com.android.systemui.statusbar.policy.NetworkController;
	import com.android.systemui.statusbar.policy.NetworkController.IconState;
	import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators;
	import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;

	import javax.inject.Inject;		import javax.inject.Inject;

packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -52,13 +52,13 @@ import com.android.systemui.qs.QSHost;
	import com.android.systemui.qs.logging.QSLogger;		import com.android.systemui.qs.logging.QSLogger;
	import com.android.systemui.qs.tileimpl.QSTileImpl;		import com.android.systemui.qs.tileimpl.QSTileImpl;
	import com.android.systemui.qs.tiles.dialog.InternetDialogFactory;		import com.android.systemui.qs.tiles.dialog.InternetDialogFactory;
	import com.android.systemui.statusbar.policy.NetworkController;		import com.android.systemui.statusbar.connectivity.NetworkController;
	import com.android.systemui.statusbar.policy.NetworkController.AccessPointController;		import com.android.systemui.statusbar.connectivity.NetworkController.AccessPointController;
	import com.android.systemui.statusbar.policy.NetworkController.IconState;		import com.android.systemui.statusbar.connectivity.NetworkController.IconState;
	import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators;		import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators;
	import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;		import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback;
	import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators;		import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators;
	import com.android.systemui.statusbar.policy.WifiIcons;		import com.android.systemui.statusbar.connectivity.WifiIcons;

	import java.io.FileDescriptor;		import java.io.FileDescriptor;
	import java.io.PrintWriter;		import java.io.PrintWriter;