Merge "12/N Remove QSLogger from QSPanel" (2bd0d626) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -300,7 +300,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		? View.VISIBLE
		: View.INVISIBLE);
		mHeader.setExpanded((keyguardShowing && !mHeaderAnimating && !mShowCollapsedOnKeyguard)
		\|\| (mQsExpanded && !mStackScrollerOverscrolling));
		\|\| (mQsExpanded && !mStackScrollerOverscrolling), mQuickQSPanelController);
		mFooter.setVisibility(
		!mQsDisabled && (mQsExpanded \|\| !keyguardShowing \|\| mHeaderAnimating
		\|\| mShowCollapsedOnKeyguard)

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

+1 −16

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

		package com.android.systemui.qs;

		import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;
		import static com.android.systemui.util.Utils.useQsMediaPlayer;

		import android.annotation.NonNull;
		@@ -40,7 +39,6 @@ import com.android.internal.widget.RemeasuringLinearLayout;
		import com.android.systemui.R;
		import com.android.systemui.plugins.qs.DetailAdapter;
		import com.android.systemui.plugins.qs.QSTile;
		import com.android.systemui.qs.logging.QSLogger;
		import com.android.systemui.settings.brightness.BrightnessSlider;
		import com.android.systemui.statusbar.policy.BrightnessMirrorController;
		import com.android.systemui.tuner.TunerService;
		@@ -50,9 +48,6 @@ import java.util.ArrayList;
		import java.util.List;
		import java.util.function.Consumer;

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

		/ View that represents the quick settings tile panel (when expanded/pulled down). /
		public class QSPanel extends LinearLayout implements Tunable {

		@@ -83,7 +78,6 @@ public class QSPanel extends LinearLayout implements Tunable {
		protected boolean mListening;

		private QSDetail.Callback mCallback;
		private final QSLogger mQSLogger;
		protected QSTileHost mHost;
		private final List<OnConfigurationChangedListener> mOnConfigurationChangedListeners =
		new ArrayList<>();
		@@ -119,19 +113,12 @@ public class QSPanel extends LinearLayout implements Tunable {
		private int mFooterMarginStartHorizontal;
		private Consumer<Boolean> mMediaVisibilityChangedListener;


		@Inject
		public QSPanel(
		@Named(VIEW_CONTEXT) Context context,
		AttributeSet attrs,
		QSLogger qsLogger
		) {
		public QSPanel(Context context, AttributeSet attrs) {
		super(context, attrs);
		mUsingMediaPlayer = useQsMediaPlayer(context);
		mMediaTotalBottomMargin = getResources().getDimensionPixelSize(
		R.dimen.quick_settings_bottom_margin_media);
		mContext = context;
		mQSLogger = qsLogger;

		setOrientation(VERTICAL);

		@@ -161,7 +148,6 @@ public class QSPanel extends LinearLayout implements Tunable {
		lp = new LayoutParams(LayoutParams.MATCH_PARENT, 0, 1);
		addView(mHorizontalLinearLayout, lp);
		}
		mQSLogger.logAllTilesChangeListening(mListening, getDumpableTag(), "");
		}

		protected void onMediaVisibilityChanged(Boolean visible) {
		@@ -439,7 +425,6 @@ public class QSPanel extends LinearLayout implements Tunable {

		public void setExpanded(boolean expanded) {
		if (mExpanded == expanded) return;
		mQSLogger.logPanelExpanded(expanded, getDumpableTag());
		mExpanded = expanded;
		if (!mExpanded && mTileLayout instanceof PagedTileLayout) {
		((PagedTileLayout) mTileLayout).setCurrentItem(0, false);

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,11 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		mDumpManager = dumpManager;
		}

		@Override
		protected void onInit() {
		mQSLogger.logAllTilesChangeListening(mView.isListening(), mView.getDumpableTag(), "");
		}

		@Override
		protected void onViewAttached() {
		mQsTileRevealController = createTileRevealController();
		@@ -221,6 +226,11 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr

		/** */
		public void setExpanded(boolean expanded) {
		if (mView.isExpanded() == expanded) {
		return;
		}
		mQSLogger.logPanelExpanded(expanded, mView.getDumpableTag());

		mView.setExpanded(expanded);
		mMetricsLogger.visibility(MetricsEvent.QS_PANEL, expanded);
		if (!expanded) {

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

+2 −14

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

		package com.android.systemui.qs;

		import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;

		import android.content.Context;
		import android.content.res.Configuration;
		import android.graphics.Rect;
		@@ -31,10 +29,6 @@ import com.android.systemui.R;
		import com.android.systemui.plugins.qs.QSTile;
		import com.android.systemui.plugins.qs.QSTile.SignalState;
		import com.android.systemui.plugins.qs.QSTile.State;
		import com.android.systemui.qs.logging.QSLogger;

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

		/**
		* Version of QSPanel that only shows N Quick Tiles in the QS Header.
		@@ -49,14 +43,8 @@ public class QuickQSPanel extends QSPanel {
		private boolean mDisabledByPolicy;
		private int mMaxTiles;


		@Inject
		public QuickQSPanel(
		@Named(VIEW_CONTEXT) Context context,
		AttributeSet attrs,
		QSLogger qsLogger,
		UiEventLogger uiEventLogger) {
		super(context, attrs, qsLogger);
		public QuickQSPanel(Context context, AttributeSet attrs) {
		super(context, attrs);
		mMaxTiles = Math.min(DEFAULT_MAX_TILES,
		getResources().getInteger(R.integer.quick_qs_panel_max_columns));
		applyBottomMargin((View) mRegularTileLayout);

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -311,10 +311,11 @@ public class QuickStatusBarHeader extends RelativeLayout implements LifecycleOwn
		.build();
		}

		public void setExpanded(boolean expanded) {
		/** */
		public void setExpanded(boolean expanded, QuickQSPanelController quickQSPanelController) {
		if (mExpanded == expanded) return;
		mExpanded = expanded;
		mHeaderQsPanel.setExpanded(expanded);
		quickQSPanelController.setExpanded(expanded);
		updateEverything();
		}