Remove Dependency.get usages from QS tiles (c0e0e2b8) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.qs.QSTile.BooleanState;
		@@ -47,12 +46,14 @@ public class AirplaneModeTile extends QSTileImpl<BooleanState> {
		private final Icon mIcon =
		ResourceIcon.get(R.drawable.ic_signal_airplane);
		private final GlobalSetting mSetting;
		private final ActivityStarter mActivityStarter;

		private boolean mListening;

		@Inject
		public AirplaneModeTile(QSHost host) {
		public AirplaneModeTile(QSHost host, ActivityStarter activityStarter) {
		super(host);
		mActivityStarter = activityStarter;

		mSetting = new GlobalSetting(mContext, mHandler, Global.AIRPLANE_MODE_ON) {
		@Override
		@@ -73,7 +74,7 @@ public class AirplaneModeTile extends QSTileImpl<BooleanState> {
		MetricsLogger.action(mContext, getMetricsCategory(), !airplaneModeEnabled);
		if (!airplaneModeEnabled && Boolean.parseBoolean(
		SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
		Dependency.get(ActivityStarter.class).postStartActivityDismissingKeyguard(
		mActivityStarter.postStartActivityDismissingKeyguard(
		new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS), 0);
		return;
		}

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.widget.Switch;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settingslib.graph.BatteryMeterDrawableBase;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.plugins.qs.QSTile.BooleanState;
		import com.android.systemui.qs.QSHost;
		@@ -43,9 +42,9 @@ public class BatterySaverTile extends QSTileImpl<BooleanState> implements
		private boolean mPluggedIn;

		@Inject
		public BatterySaverTile(QSHost host) {
		public BatterySaverTile(QSHost host, BatteryController batteryController) {
		super(host);
		mBatteryController = Dependency.get(BatteryController.class);
		mBatteryController = batteryController;
		}

		@Override

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settingslib.Utils;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		import com.android.settingslib.graph.BluetoothDeviceLayerDrawable;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.qs.DetailAdapter;
		@@ -62,10 +61,12 @@ public class BluetoothTile extends QSTileImpl<BooleanState> {
		private final ActivityStarter mActivityStarter;

		@Inject
		public BluetoothTile(QSHost host) {
		public BluetoothTile(QSHost host,
		BluetoothController bluetoothController,
		ActivityStarter activityStarter) {
		super(host);
		mController = Dependency.get(BluetoothController.class);
		mActivityStarter = Dependency.get(ActivityStarter.class);
		mController = bluetoothController;
		mActivityStarter = activityStarter;
		mDetailAdapter = (BluetoothDetailAdapter) createDetailAdapter();
		}

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import android.widget.Button;
		import com.android.internal.app.MediaRouteDialogPresenter;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.qs.DetailAdapter;
		@@ -68,13 +67,14 @@ public class CastTile extends QSTileImpl<BooleanState> {
		private boolean mWifiConnected;

		@Inject
		public CastTile(QSHost host) {
		public CastTile(QSHost host, CastController castController, KeyguardMonitor keyguardMonitor,
		NetworkController networkController, ActivityStarter activityStarter) {
		super(host);
		mController = Dependency.get(CastController.class);
		mController = castController;
		mDetailAdapter = new CastDetailAdapter();
		mKeyguard = Dependency.get(KeyguardMonitor.class);
		mNetworkController = Dependency.get(NetworkController.class);
		mActivityStarter = Dependency.get(ActivityStarter.class);
		mKeyguard = keyguardMonitor;
		mNetworkController = networkController;
		mActivityStarter = activityStarter;
		}

		@Override
		@@ -138,7 +138,7 @@ public class CastTile extends QSTileImpl<BooleanState> {
		mDialog = MediaRouteDialogPresenter.createDialog(mContext, ROUTE_TYPE_REMOTE_DISPLAY,
		v -> {
		mDialog.dismiss();
		Dependency.get(ActivityStarter.class)
		mActivityStarter
		.postStartActivityDismissingKeyguard(getLongClickIntent(), 0);
		});
		mDialog.getWindow().setType(LayoutParams.TYPE_KEYGUARD_DIALOG);

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.widget.Switch;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settingslib.net.DataUsageController;
		import com.android.systemui.Dependency;
		import com.android.systemui.Prefs;
		import com.android.systemui.R;
		import com.android.systemui.plugins.ActivityStarter;
		@@ -66,11 +65,12 @@ public class CellularTile extends QSTileImpl<SignalState> {
		private final KeyguardMonitor mKeyguardMonitor;

		@Inject
		public CellularTile(QSHost host) {
		public CellularTile(QSHost host, NetworkController networkController,
		ActivityStarter activityStarter, KeyguardMonitor keyguardMonitor) {
		super(host);
		mController = Dependency.get(NetworkController.class);
		mActivityStarter = Dependency.get(ActivityStarter.class);
		mKeyguardMonitor = Dependency.get(KeyguardMonitor.class);
		mController = networkController;
		mActivityStarter = activityStarter;
		mKeyguardMonitor = keyguardMonitor;
		mDataController = mController.getMobileDataController();
		mDetailAdapter = new CellularDetailAdapter();
		}