Merge "7/N Inject media hosts directly." (d40df51f) · Commits · e / os / android_frameworks_base

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

+12 −5

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@ package com.android.systemui.qs;

		import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;

		import static com.android.systemui.media.dagger.MediaModule.QS_PANEL;
		import static com.android.systemui.media.dagger.MediaModule.QUICK_QS_PANEL;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.content.res.Configuration;
		@@ -50,6 +53,7 @@ import com.android.systemui.util.LifecycleFragment;
		import com.android.systemui.util.Utils;

		import javax.inject.Inject;
		import javax.inject.Named;

		public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Callbacks,
		StatusBarStateController.StateListener {
		@@ -82,6 +86,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		private final InjectionInflationController mInjectionInflater;
		private final CommandQueue mCommandQueue;
		private final QSDetailDisplayer mQsDetailDisplayer;
		private final MediaHost mQsMediaHost;
		private final MediaHost mQqsMediaHost;
		private final QSFragmentComponent.Factory mQsComponentFactory;
		private final QSTileHost mHost;
		private boolean mShowCollapsedOnKeyguard;
		@@ -104,12 +110,15 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		public QSFragment(RemoteInputQuickSettingsDisabler remoteInputQsDisabler,
		InjectionInflationController injectionInflater, QSTileHost qsTileHost,
		StatusBarStateController statusBarStateController, CommandQueue commandQueue,
		QSDetailDisplayer qsDetailDisplayer,
		QSDetailDisplayer qsDetailDisplayer, @Named(QS_PANEL) MediaHost qsMediaHost,
		@Named(QUICK_QS_PANEL) MediaHost qqsMediaHost,
		QSFragmentComponent.Factory qsComponentFactory) {
		mRemoteInputQuickSettingsDisabler = remoteInputQsDisabler;
		mInjectionInflater = injectionInflater;
		mCommandQueue = commandQueue;
		mQsDetailDisplayer = qsDetailDisplayer;
		mQsMediaHost = qsMediaHost;
		mQqsMediaHost = qqsMediaHost;
		mQsComponentFactory = qsComponentFactory;
		commandQueue.observe(getLifecycle(), this);
		mHost = qsTileHost;
		@@ -454,11 +463,9 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		float expandedMediaPosition = absoluteBottomPosition - mQSPanelScrollView.getScrollY()
		+ mQSPanelScrollView.getScrollRange();
		// The expanded media host should never move below the laid out position
		pinToBottom(
		expandedMediaPosition, mQSPanelController.getMediaHost(), true /* expanded */);
		pinToBottom(expandedMediaPosition, mQsMediaHost, true /* expanded */);
		// The expanded media host should never move above the laid out position
		pinToBottom(absoluteBottomPosition, mHeader.getHeaderQsPanel().getMediaHost(),
		false /* expanded */);
		pinToBottom(absoluteBottomPosition, mQqsMediaHost, false /* expanded */);
		}
		}

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -550,6 +550,7 @@ public class QSPanel extends LinearLayout implements Tunable {
		}
		boolean horizontal = shouldUseHorizontalLayout();
		ViewGroup host = mMediaHost.getHostView();

		ViewGroup newParent = horizontal ? mHorizontalLinearLayout : this;
		ViewGroup currentParent = (ViewGroup) host.getParent();
		if (currentParent != newParent) {
		@@ -865,10 +866,6 @@ public class QSPanel extends LinearLayout implements Tunable {
		}
		}

		public MediaHost getMediaHost() {
		return mMediaHost;
		}

		/**
		* Set the header container of quick settings.
		*/

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

+6 −6

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.qs.QSPanel.QS_SHOW_BRIGHTNESS;

		import android.annotation.NonNull;
		@@ -40,6 +41,7 @@ import com.android.systemui.tuner.TunerService;
		import java.util.function.Consumer;

		import javax.inject.Inject;
		import javax.inject.Named;

		/**
		* Controller for {@link QSPanel}.
		@@ -74,11 +76,13 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> {
		@Inject
		QSPanelController(QSPanel view, QSSecurityFooter qsSecurityFooter, TunerService tunerService,
		QSTileHost qstileHost, QSCustomizerController qsCustomizerController,
		@Named(QS_PANEL) MediaHost mediaHost,
		QSTileRevealController.Factory qsTileRevealControllerFactory,
		DumpManager dumpManager, MetricsLogger metricsLogger, UiEventLogger uiEventLogger,
		BrightnessController.Factory brightnessControllerFactory,
		BrightnessSlider.Factory brightnessSliderFactory) {
		super(view, qstileHost, qsCustomizerController, metricsLogger, uiEventLogger, dumpManager);
		super(view, qstileHost, qsCustomizerController, mediaHost, metricsLogger, uiEventLogger,
		dumpManager);
		mQsSecurityFooter = qsSecurityFooter;
		mTunerService = tunerService;
		mQsCustomizerController = qsCustomizerController;
		@@ -94,6 +98,7 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> {

		@Override
		public void onInit() {
		super.init();
		mQsCustomizerController.init();
		mBrightnessSlider.init();
		}
		@@ -165,11 +170,6 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> {
		}
		}

		/** */
		public MediaHost getMediaHost() {
		return mView.getMediaHost();
		}

		/** */
		public void setBrightnessMirror(BrightnessMirrorController brightnessMirrorController) {
		mBrightnessMirrorController = brightnessMirrorController;

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -73,12 +73,12 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		};

		protected QSPanelControllerBase(T view, QSTileHost host,
		QSCustomizerController qsCustomizerController,
		QSCustomizerController qsCustomizerController, MediaHost mediaHost,
		MetricsLogger metricsLogger, UiEventLogger uiEventLogger, DumpManager dumpManager) {
		super(view);
		mHost = host;
		mQsCustomizerController = qsCustomizerController;
		mMediaHost = mView.getMediaHost();
		mMediaHost = mediaHost;
		mMetricsLogger = metricsLogger;
		mUiEventLogger = uiEventLogger;
		mDumpManager = dumpManager;
		@@ -193,7 +193,6 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		.collect(Collectors.joining(","));
		}


		/** */
		public void setExpanded(boolean expanded) {
		mView.setExpanded(expanded);
		@@ -235,7 +234,6 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		boolean switchTileLayout(boolean force) {
		if (mView.switchTileLayout(force, mRecords)) {
		setTiles();
		mView.reSetLayoutListening();
		return true;
		}
		return false;

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -16,10 +16,13 @@

		package com.android.systemui.qs;

		import static com.android.systemui.media.dagger.MediaModule.QUICK_QS_PANEL;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.UiEventLogger;
		import com.android.systemui.R;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.media.MediaHost;
		import com.android.systemui.plugins.qs.QSTile;
		import com.android.systemui.qs.customize.QSCustomizerController;
		import com.android.systemui.qs.dagger.QSScope;
		@@ -28,6 +31,7 @@ import java.util.ArrayList;
		import java.util.List;

		import javax.inject.Inject;
		import javax.inject.Named;

		/** Controller for {@link QuickQSPanel}. */
		@QSScope
		@@ -46,9 +50,11 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel>
		@Inject
		QuickQSPanelController(QuickQSPanel view, QSTileHost qsTileHost,
		QSCustomizerController qsCustomizerController,
		@Named(QUICK_QS_PANEL) MediaHost mediaHost,
		MetricsLogger metricsLogger, UiEventLogger uiEventLogger,
		DumpManager dumpManager) {
		super(view, qsTileHost, qsCustomizerController, metricsLogger, uiEventLogger, dumpManager);
		super(view, qsTileHost, qsCustomizerController, mediaHost, metricsLogger, uiEventLogger,
		dumpManager);
		}

		@Override