Merge changes from topic "QSTileImplInjection" (31417a79) · Commits · e / os / android_frameworks_base

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

+1 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.app.INotificationManager;
		import android.content.Context;
		import android.content.SharedPreferences;
		import android.hardware.display.AmbientDisplayConfiguration;
		import android.hardware.display.NightDisplayListener;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.Looper;
		@@ -78,7 +77,7 @@ import dagger.Provides;
		*
		* See SystemUI/docs/dagger.md
		*/
		@Module
		@Module(includes = {NightDisplayListenerModule.class})
		public class DependencyProvider {

		@Singleton
		@@ -151,13 +150,6 @@ public class DependencyProvider {
		return new MetricsLogger();
		}

		@Singleton
		@Provides
		public NightDisplayListener provideNightDisplayListener(Context context,
		@Background Handler bgHandler) {
		return new NightDisplayListener(context, bgHandler);
		}

		@Singleton
		@Provides
		public PluginManager providePluginManager(Context context) {

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

0 → 100644

+81 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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;

		import android.content.Context;
		import android.hardware.display.NightDisplayListener;
		import android.os.Handler;
		import android.os.UserHandle;

		import com.android.systemui.dagger.qualifiers.Background;

		import javax.inject.Inject;

		import dagger.Module;
		import dagger.Provides;

		/**
		* Module for providing a {@link NightDisplayListener}.
		*/
		@Module
		public class NightDisplayListenerModule {

		/**
		* Provides a {@link NightDisplayListener}.
		*
		* The provided listener is associated with the user as returned by
		* {@link android.app.ActivityManager#getCurrentUser}, making an IPC call on its creation.
		* If the current user is known, prefer using a {@link Builder}.
		*/
		@Provides
		public NightDisplayListener provideNightDisplayListener(Context context,
		@Background Handler bgHandler) {
		return new NightDisplayListener(context, bgHandler);
		}

		/**
		* Builder to create instances of {@link NightDisplayListener}.
		*
		* It uses {@link UserHandle#USER_SYSTEM} as the default user.
		*/
		public static class Builder {
		private final Context mContext;
		private final Handler mBgHandler;
		private int mUserId = UserHandle.USER_SYSTEM;

		@Inject
		public Builder(Context context, @Background Handler bgHandler) {
		mContext = context;
		mBgHandler = bgHandler;
		}

		/**
		* Set the userId for this builder
		*/
		public Builder setUser(int userId) {
		mUserId = userId;
		return this;
		}

		/**
		* Build a {@link NightDisplayListener} for the set user.
		*/
		public NightDisplayListener build() {
		return new NightDisplayListener(mContext, mUserId, mBgHandler);
		}
		}
		}

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import android.content.pm.ShortcutManager;
		import android.content.res.Resources;
		import android.hardware.SensorManager;
		import android.hardware.SensorPrivacyManager;
		import android.hardware.display.ColorDisplayManager;
		import android.hardware.display.DisplayManager;
		import android.media.AudioManager;
		import android.media.MediaRouter2Manager;
		@@ -104,6 +105,12 @@ public class SystemServicesModule {
		return context.getSystemService(AudioManager.class);
		}

		@Provides
		@Singleton
		static ColorDisplayManager provideColorDisplayManager(Context context) {
		return context.getSystemService(ColorDisplayManager.class);
		}

		@Provides
		@Singleton
		static ConnectivityManager provideConnectivityManagager(Context context) {

packages/SystemUI/src/com/android/systemui/qs/QSHost.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import com.android.internal.logging.InstanceId;
		import com.android.internal.logging.UiEventLogger;
		import com.android.systemui.plugins.qs.QSTile;
		import com.android.systemui.qs.external.TileServices;
		import com.android.systemui.qs.logging.QSLogger;

		import java.util.Collection;

		@@ -31,7 +30,6 @@ public interface QSHost {
		void openPanels();
		Context getContext();
		Context getUserContext();
		QSLogger getQSLogger();
		UiEventLogger getUiEventLogger();
		Collection<QSTile> getTiles();
		void addCallback(Callback callback);

packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -179,10 +179,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D
		onTuningChanged(TILES_SETTING, value);
		}

		public QSLogger getQSLogger() {
		return mQSLogger;
		}

		@Override
		public UiEventLogger getUiEventLogger() {
		return mUiEventLogger;