Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab551329 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

11/N Remove UIEventLogger from QSPanel. 

Removes UIEventLogger injection from QSPanel constructor.

Bug: 168904199
Test: atest SystemUITests
Change-Id: I2099ed36c6ba09968da2bc2de1cba23318282573
parent a2a44155

packages/SystemUI/src/com/android/systemui/qs/DoubleLineTileLayout.kt

+2 −3
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ import com.android.systemui.R 
import com.android.systemui.qs.TileLayout.exactly



class DoubleLineTileLayout(

    context: Context,

    private val uiEventLogger: UiEventLogger

    context: Context

) : ViewGroup(context), QSPanel.QSTileLayout {



    companion object {
@@ -84,7 +83,7 @@ class DoubleLineTileLayout( 
        return false

    }



    override fun setListening(listening: Boolean) {

    override fun setListening(listening: Boolean, uiEventLogger: UiEventLogger) {

        if (_listening == listening) return

        _listening = listening

        for (record in mRecords) {

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

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
    }



    @Override

    public void setListening(boolean listening) {

    public void setListening(boolean listening, UiEventLogger uiEventLogger) {

        if (mListening == listening) return;

        mListening = listening;

        updateListening();
@@ -150,7 +150,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 


    private void updateListening() {

        for (TilePage tilePage : mPages) {

            tilePage.setListening(tilePage.getParent() == null ? false : mListening);

            tilePage.setListening(tilePage.getParent() != null && mListening);

        }

    }

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

+6 −22
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ public class QSPanel extends LinearLayout implements Tunable { 


    private QSDetail.Callback mCallback;

    private final QSLogger mQSLogger;

    protected final UiEventLogger mUiEventLogger;

    protected QSTileHost mHost;

    private final List<OnConfigurationChangedListener> mOnConfigurationChangedListeners =

            new ArrayList<>();
@@ -125,8 +124,7 @@ public class QSPanel extends LinearLayout implements Tunable { 
    public QSPanel(

            @Named(VIEW_CONTEXT) Context context,

            AttributeSet attrs,

            QSLogger qsLogger,

            UiEventLogger uiEventLogger

            QSLogger qsLogger

    ) {

        super(context, attrs);

        mUsingMediaPlayer = useQsMediaPlayer(context);
@@ -134,7 +132,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
                R.dimen.quick_settings_bottom_margin_media);

        mContext = context;

        mQSLogger = qsLogger;

        mUiEventLogger = uiEventLogger;



        setOrientation(VERTICAL);
@@ -243,14 +240,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
        setMeasuredDimension(getMeasuredWidth(), height);

    }



    @Override

    protected void onDetachedFromWindow() {

        if (mTileLayout != null) {

            mTileLayout.setListening(false);

        }

        super.onDetachedFromWindow();

    }



    protected String getDumpableTag() {

        return TAG;

    }
@@ -468,15 +457,9 @@ public class QSPanel extends LinearLayout implements Tunable { 
    }



    /** */

    public void setListening(boolean listening, String cachedSpecs) {

        if (mListening == listening) return;

    public void setListening(boolean listening) {

        mListening = listening;

        if (mTileLayout != null) {

            mQSLogger.logAllTilesChangeListening(listening, getDumpableTag(), cachedSpecs);

            mTileLayout.setListening(listening);

    }

    }





    public void showDetailAdapter(boolean show, DetailAdapter adapter, int[] locationInWindow) {

        int xInWindow = locationInWindow[0];
@@ -756,7 +739,8 @@ public class QSPanel extends LinearLayout implements Tunable { 
        mSecurityFooter = view;

    }



    void setUsingHorizontalLayout(boolean horizontal, ViewGroup mediaHostView, boolean force) {

    void setUsingHorizontalLayout(boolean horizontal, ViewGroup mediaHostView, boolean force,

            UiEventLogger uiEventLogger) {

        if (horizontal != mUsingHorizontalLayout || force) {

            mUsingHorizontalLayout = horizontal;

            View visibleView = horizontal ? mHorizontalLinearLayout : (View) mRegularTileLayout;
@@ -775,7 +759,7 @@ public class QSPanel extends LinearLayout implements Tunable { 
            switchAllContentToParent(newParent, newLayout);

            reAttachMediaHost(mediaHostView, horizontal);

            mTileLayout = newLayout;

            newLayout.setListening(mListening);

            newLayout.setListening(mListening, uiEventLogger);

            if (needsDynamicRowsAndColumns()) {

                newLayout.setMinRows(horizontal ? 2 : 1);

                // Let's use 3 columns to match the current layout
@@ -835,7 +819,7 @@ public class QSPanel extends LinearLayout implements Tunable { 
        boolean updateResources();



        /** */

        void setListening(boolean listening);

        void setListening(boolean listening, UiEventLogger uiEventLogger);



        /**

         * Set the minimum number of rows to show

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

+4 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.plugins.qs.DetailAdapter; 
import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.qs.customize.QSCustomizerController;

import com.android.systemui.qs.dagger.QSScope;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.settings.brightness.BrightnessController;

import com.android.systemui.settings.brightness.BrightnessSlider;

import com.android.systemui.statusbar.policy.BrightnessMirrorController;
@@ -85,10 +86,10 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
            @Named(QS_PANEL) MediaHost mediaHost,

            QSTileRevealController.Factory qsTileRevealControllerFactory,

            DumpManager dumpManager, MetricsLogger metricsLogger, UiEventLogger uiEventLogger,

            BrightnessController.Factory brightnessControllerFactory,

            QSLogger qsLogger, BrightnessController.Factory brightnessControllerFactory,

            BrightnessSlider.Factory brightnessSliderFactory) {

        super(view, qstileHost, qsCustomizerController, usingMediaPlayer, mediaHost, metricsLogger,

                uiEventLogger, dumpManager);

        super(view, qstileHost, qsCustomizerController, usingMediaPlayer, mediaHost,

                metricsLogger, uiEventLogger, qsLogger, dumpManager);

        mQsSecurityFooter = qsSecurityFooter;

        mTunerService = tunerService;

        mQsCustomizerController = qsCustomizerController;

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

+15 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.plugins.qs.QSTile; 
import com.android.systemui.plugins.qs.QSTileView;

import com.android.systemui.qs.customize.QSCustomizerController;

import com.android.systemui.qs.external.CustomTile;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.util.ViewController;

import com.android.systemui.util.animation.DisappearParameters;
@@ -60,6 +61,7 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr 
    protected final MediaHost mMediaHost;

    protected final MetricsLogger mMetricsLogger;

    private final UiEventLogger mUiEventLogger;

    private final QSLogger mQSLogger;

    private final DumpManager mDumpManager;

    protected final ArrayList<TileRecord> mRecords = new ArrayList<>();
@@ -92,7 +94,8 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr 
    protected QSPanelControllerBase(T view, QSTileHost host,

            QSCustomizerController qsCustomizerController,

            @Named(QS_USING_MEDIA_PLAYER) boolean usingMediaPlayer, MediaHost mediaHost,

            MetricsLogger metricsLogger, UiEventLogger uiEventLogger, DumpManager dumpManager) {

            MetricsLogger metricsLogger, UiEventLogger uiEventLogger, QSLogger qsLogger,

            DumpManager dumpManager) {

        super(view);

        mHost = host;

        mQsCustomizerController = qsCustomizerController;
@@ -100,6 +103,7 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr 
        mMediaHost = mediaHost;

        mMetricsLogger = metricsLogger;

        mUiEventLogger = uiEventLogger;

        mQSLogger = qsLogger;

        mDumpManager = dumpManager;

    }
@@ -125,6 +129,8 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr 
        mView.removeOnConfigurationChangedListener(mOnConfigurationChangedListener);

        mHost.removeCallback(mQSHostCallback);



        mView.getTileLayout().setListening(false, mUiEventLogger);



        mMediaHost.removeVisibilityChangeListener(mMediaHostVisibilityListener);



        for (TileRecord record : mRecords) {
@@ -248,7 +254,12 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr 




    void setListening(boolean listening) {

        mView.setListening(listening, mCachedSpecs);

        mView.setListening(listening);



        if (mView.getTileLayout() != null) {

            mQSLogger.logAllTilesChangeListening(listening, mView.getDumpableTag(), mCachedSpecs);

            mView.getTileLayout().setListening(listening, mUiEventLogger);

        }

    }



    boolean switchTileLayout(boolean force) {
@@ -267,7 +278,8 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr 
                mView.removeTile(record);

                record.tile.removeCallback(record.callback);

            }

            mView.setUsingHorizontalLayout(mUsingHorizontalLayout, mMediaHost.getHostView(), force);

            mView.setUsingHorizontalLayout(mUsingHorizontalLayout, mMediaHost.getHostView(), force,

                    mUiEventLogger);

            updateMediaDisappearParameters();



            setTiles();