Merge "Knock out a few calls to Dependency#get" (7379e571) · Commits · e / os / android_frameworks_base

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public final class ForegroundServicesDialog extends AlertActivity implements

		LayoutInflater mInflater;

		private MetricsLogger mMetricsLogger;
		private final MetricsLogger mMetricsLogger;

		private String[] mPackages;
		private PackageItemAdapter mAdapter;
		@@ -75,16 +75,15 @@ public final class ForegroundServicesDialog extends AlertActivity implements
		};

		@Inject
		ForegroundServicesDialog() {
		ForegroundServicesDialog(MetricsLogger metricsLogger) {
		super();
		mMetricsLogger = metricsLogger;
		}

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

		mMetricsLogger = Dependency.get(MetricsLogger.class);

		mInflater = LayoutInflater.from(this);

		mAdapter = new PackageItemAdapter(this);

packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.content.pm.ResolveInfo;
		import androidx.annotation.Nullable;

		import com.android.systemui.BootCompleteCache;
		import com.android.systemui.Dependency;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		@@ -78,10 +77,11 @@ public final class PhoneStateMonitor {

		@Inject
		PhoneStateMonitor(Context context, BroadcastDispatcher broadcastDispatcher,
		Lazy<Optional<StatusBar>> statusBarOptionalLazy, BootCompleteCache bootCompleteCache) {
		Lazy<Optional<StatusBar>> statusBarOptionalLazy, BootCompleteCache bootCompleteCache,
		StatusBarStateController statusBarStateController) {
		mContext = context;
		mStatusBarOptionalLazy = statusBarOptionalLazy;
		mStatusBarStateController = Dependency.get(StatusBarStateController.class);
		mStatusBarStateController = statusBarStateController;

		mDefaultHome = getCurrentDefaultHome();
		bootCompleteCache.addListener(() -> mDefaultHome = getCurrentDefaultHome());

packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java

+12 −5

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.widget.FrameLayout;

		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.assist.AssistLogger;
		import com.android.systemui.assist.AssistManager;
		@@ -46,6 +45,8 @@ import java.util.Locale;

		import javax.inject.Inject;

		import dagger.Lazy;

		/**
		* Default UiController implementation. Shows white edge lights along the bottom of the phone,
		* expanding from the corners to meet in the center.
		@@ -65,6 +66,8 @@ public class DefaultUiController implements AssistManager.UiController {
		protected final AssistLogger mAssistLogger;

		private final WindowManager mWindowManager;
		private final MetricsLogger mMetricsLogger;
		private final Lazy<AssistManager> mAssistManagerLazy;
		private final WindowManager.LayoutParams mLayoutParams;
		private final PathInterpolator mProgressInterpolator = new PathInterpolator(.83f, 0, .84f, 1);

		@@ -75,10 +78,14 @@ public class DefaultUiController implements AssistManager.UiController {
		private ValueAnimator mInvocationAnimator = new ValueAnimator();

		@Inject
		public DefaultUiController(Context context, AssistLogger assistLogger) {
		public DefaultUiController(Context context, AssistLogger assistLogger,
		WindowManager windowManager, MetricsLogger metricsLogger,
		Lazy<AssistManager> assistManagerLazy) {
		mAssistLogger = assistLogger;
		mRoot = new FrameLayout(context);
		mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
		mWindowManager = windowManager;
		mMetricsLogger = metricsLogger;
		mAssistManagerLazy = assistManagerLazy;

		mLayoutParams = new WindowManager.LayoutParams(
		WindowManager.LayoutParams.MATCH_PARENT,
		@@ -152,9 +159,9 @@ public class DefaultUiController implements AssistManager.UiController {
		/* isInvocationComplete = */ false,
		/* assistantComponent = */ null,
		/* legacyDeviceState = */ null);
		MetricsLogger.action(new LogMaker(MetricsEvent.ASSISTANT)
		mMetricsLogger.write(new LogMaker(MetricsEvent.ASSISTANT)
		.setType(MetricsEvent.TYPE_ACTION)
		.setSubtype(Dependency.get(AssistManager.class).toLoggingSubType(type)));
		.setSubtype(mAssistManagerLazy.get().toLoggingSubType(type)));
		}
		// Logs assistant invocation cancelled.
		if ((mInvocationAnimator == null \|\| !mInvocationAnimator.isRunning())

packages/SystemUI/src/com/android/systemui/statusbar/tv/VpnStatusObserver.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.content.Context
		import com.android.internal.messages.nano.SystemMessageProto
		import com.android.internal.net.VpnConfig
		import com.android.systemui.CoreStartable
		import com.android.systemui.Dependency
		import com.android.systemui.R
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.statusbar.policy.SecurityController
		@@ -35,12 +34,13 @@ import javax.inject.Inject
		* Observes if a vpn connection is active and displays a notification to the user
		*/
		@SysUISingleton
		class VpnStatusObserver @Inject constructor(context: Context) : CoreStartable(context),
		class VpnStatusObserver @Inject constructor(
		context: Context,
		private val securityController: SecurityController
		) : CoreStartable(context),
		SecurityController.SecurityControllerCallback {

		private var vpnConnected = false
		private val securityController: SecurityController =
		Dependency.get(SecurityController::class.java)
		private val notificationManager = NotificationManager.from(context)
		private val notificationChannel = createNotificationChannel()
		private val vpnConnectedNotificationBuilder = createVpnConnectedNotificationBuilder()