Merge "Cleanup GlobalModule." into tm-dev (6584dbb6) · Commits · e / os / android_frameworks_base

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -19,9 +19,13 @@ package com.android.systemui.dagger;
		import android.content.Context;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.UiEventLogger;
		import com.android.internal.logging.UiEventLoggerImpl;
		import com.android.internal.util.NotificationMessagingUtil;
		import com.android.internal.widget.LockPatternUtils;

		import javax.inject.Singleton;

		import dagger.Module;
		import dagger.Provides;

		@@ -32,14 +36,14 @@ import dagger.Provides;
		public class AndroidInternalsModule {
		/** */
		@Provides
		@SysUISingleton
		@Singleton
		public LockPatternUtils provideLockPatternUtils(Context context) {
		return new LockPatternUtils(context);
		}

		/** */
		@Provides
		@SysUISingleton
		@Singleton
		public MetricsLogger provideMetricsLogger() {
		return new MetricsLogger();
		}
		@@ -50,4 +54,10 @@ public class AndroidInternalsModule {
		return new NotificationMessagingUtil(context);
		}

		/** Provides an instance of {@link com.android.internal.logging.UiEventLogger} */
		@Provides
		@Singleton
		static UiEventLogger provideUiEventLogger() {
		return new UiEventLoggerImpl();
		}
		}

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import dagger.Module;
		*/
		@Deprecated
		@Module(includes = {
		AndroidInternalsModule.class,
		BroadcastDispatcherModule.class,
		LeakModule.class,
		NightDisplayListenerModule.class,

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ import com.android.internal.util.LatencyTracker;
		import com.android.systemui.Prefs;
		import com.android.systemui.dagger.qualifiers.DisplayId;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dagger.qualifiers.TestHarness;
		import com.android.systemui.shared.system.PackageManagerWrapper;

		import java.util.Optional;
		@@ -443,6 +444,13 @@ public class FrameworkServicesModule {
		return context.getSystemService(TelephonyManager.class);
		}

		@Provides
		@Singleton
		@TestHarness
		static boolean provideIsTestHarness() {
		return ActivityManager.isRunningInUserTestHarness();
		}

		@Provides
		@Singleton
		static TrustManager provideTrustManager(Context context) {

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

+14 −36

Original line number	Diff line number	Diff line
		@@ -16,23 +16,15 @@

		package com.android.systemui.dagger;

		import android.app.ActivityManager;
		import android.content.Context;
		import android.util.DisplayMetrics;
		import android.view.Display;

		import com.android.internal.logging.UiEventLogger;
		import com.android.internal.logging.UiEventLoggerImpl;
		import com.android.systemui.dagger.qualifiers.TestHarness;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.dagger.qualifiers.Application;
		import com.android.systemui.plugins.PluginsModule;
		import com.android.systemui.unfold.UnfoldTransitionModule;
		import com.android.systemui.util.concurrency.GlobalConcurrencyModule;

		import java.util.concurrent.Executor;
		import java.util.concurrent.Executors;

		import javax.inject.Singleton;

		import dagger.Module;
		import dagger.Provides;

		@@ -52,43 +44,29 @@ import dagger.Provides;
		* Please use discretion when adding things to the global scope.
		*/
		@Module(includes = {
		AndroidInternalsModule.class,
		FrameworkServicesModule.class,
		GlobalConcurrencyModule.class,
		UnfoldTransitionModule.class,
		PluginsModule.class,
		})
		public class GlobalModule {

		/** */
		@Provides
		public DisplayMetrics provideDisplayMetrics(Context context) {
		DisplayMetrics displayMetrics = new DisplayMetrics();
		context.getDisplay().getMetrics(displayMetrics);
		return displayMetrics;
		}

		/** Provides an instance of {@link com.android.internal.logging.UiEventLogger} */
		@Provides
		@Singleton
		static UiEventLogger provideUiEventLogger() {
		return new UiEventLoggerImpl();
		}

		/**
		* TODO(b/229228871): This should be the default. No undecorated context should be available.
		*/
		@Provides
		@TestHarness
		static boolean provideIsTestHarness() {
		return ActivityManager.isRunningInUserTestHarness();
		@Application
		public Context provideApplicationContext(Context context) {
		return context.getApplicationContext();
		}

		/**
		* Provide an Executor specifically for running UI operations on a separate thread.
		*
		* Keep submitted runnables short and to the point, just as with any other UI code.
		* @deprecated Deprecdated because {@link Display#getMetrics} is deprecated.
		*/
		@Provides
		@Singleton
		@UiBackground
		public static Executor provideUiBackgroundExecutor() {
		return Executors.newSingleThreadExecutor();
		public DisplayMetrics provideDisplayMetrics(Context context) {
		DisplayMetrics displayMetrics = new DisplayMetrics();
		context.getDisplay().getMetrics(displayMetrics);
		return displayMetrics;
		}
		}

packages/SystemUI/src/com/android/systemui/dagger/qualifiers/Application.java

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.dagger.qualifiers;

		import static java.lang.annotation.RetentionPolicy.RUNTIME;

		import android.content.Context;

		import java.lang.annotation.Documented;
		import java.lang.annotation.Retention;

		import javax.inject.Qualifier;

		/**
		* Used to qualify a context as {@link Context#getApplicationContext}
		*/
		@Qualifier
		@Documented
		@Retention(RUNTIME)
		public @interface Application {
		}