Merge "Qualify injected MediaHosts" (fe82ad21) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import com.android.systemui.demomode.DemoModeController;
		import com.android.systemui.dock.DockManager;
		import com.android.systemui.dock.DockManagerImpl;
		import com.android.systemui.doze.DozeHost;
		import com.android.systemui.media.dagger.MediaModule;
		import com.android.systemui.plugins.qs.QSFactory;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.power.EnhancedEstimates;
		@@ -74,6 +75,7 @@ import dagger.Provides;
		* overridden by the System UI implementation.
		*/
		@Module(includes = {
		MediaModule.class,
		QSModule.class,
		WMShellModule.class
		})

packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.media

		import android.view.View
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.media.dagger.MediaModule.KEYGUARD
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.statusbar.NotificationLockscreenUserManager
		import com.android.systemui.statusbar.StatusBarState
		@@ -25,6 +26,7 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController
		import com.android.systemui.statusbar.notification.stack.MediaHeaderView
		import com.android.systemui.statusbar.phone.KeyguardBypassController
		import javax.inject.Inject
		import javax.inject.Named

		/**
		* A class that controls the media notifications on the lock screen, handles its visibility and
		@@ -32,7 +34,7 @@ import javax.inject.Inject
		*/
		@SysUISingleton
		class KeyguardMediaController @Inject constructor(
		private val mediaHost: MediaHost,
		@param:Named(KEYGUARD) private val mediaHost: MediaHost,
		private val bypassController: KeyguardBypassController,
		private val statusBarStateController: SysuiStatusBarStateController,
		private val notifLockscreenUserManager: NotificationLockscreenUserManager

packages/SystemUI/src/com/android/systemui/media/MediaHost.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ import com.android.systemui.util.animation.UniqueObjectHostView
		import java.util.Objects
		import javax.inject.Inject

		class MediaHost @Inject constructor(
		class MediaHost constructor(
		private val state: MediaHostStateHolder,
		private val mediaHierarchyManager: MediaHierarchyManager,
		private val mediaDataManager: MediaDataManager,

packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java

0 → 100644

+66 −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.media.dagger;

		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.media.MediaDataManager;
		import com.android.systemui.media.MediaHierarchyManager;
		import com.android.systemui.media.MediaHost;
		import com.android.systemui.media.MediaHostStatesManager;

		import javax.inject.Named;

		import dagger.Module;
		import dagger.Provides;

		/** Dagger module for the media package. */
		@Module
		public interface MediaModule {
		String QS_PANEL = "media_qs_panel";
		String QUICK_QS_PANEL = "media_quick_qs_panel";
		String KEYGUARD = "media_keyguard";

		/** */
		@Provides
		@SysUISingleton
		@Named(QS_PANEL)
		static MediaHost providesQSMediaHost(MediaHost.MediaHostStateHolder stateHolder,
		MediaHierarchyManager hierarchyManager, MediaDataManager dataManager,
		MediaHostStatesManager statesManager) {
		return new MediaHost(stateHolder, hierarchyManager, dataManager, statesManager);
		}

		/** */
		@Provides
		@SysUISingleton
		@Named(QUICK_QS_PANEL)
		static MediaHost providesQuickQSMediaHost(MediaHost.MediaHostStateHolder stateHolder,
		MediaHierarchyManager hierarchyManager, MediaDataManager dataManager,
		MediaHostStatesManager statesManager) {
		return new MediaHost(stateHolder, hierarchyManager, dataManager, statesManager);
		}

		/** */
		@Provides
		@SysUISingleton
		@Named(KEYGUARD)
		static MediaHost providesKeyguardMediaHost(MediaHost.MediaHostStateHolder stateHolder,
		MediaHierarchyManager hierarchyManager, MediaDataManager dataManager,
		MediaHostStatesManager statesManager) {
		return new MediaHost(stateHolder, hierarchyManager, dataManager, statesManager);
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.qs;

		import static com.android.systemui.media.dagger.MediaModule.QS_PANEL;
		import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;
		import static com.android.systemui.util.Utils.useQsMediaPlayer;

		@@ -158,7 +159,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne
		DumpManager dumpManager,
		BroadcastDispatcher broadcastDispatcher,
		QSLogger qsLogger,
		MediaHost mediaHost,
		@Named(QS_PANEL) MediaHost mediaHost,
		UiEventLogger uiEventLogger,
		UserTracker userTracker
		) {