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

Commit c70c3f79 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes I2099ed36,I38f6c4d4,I6f8c54bb 

* changes:
  11/N Remove UIEventLogger from QSPanel.
  10/N Remove MetricsLogger from QSPanel
  9/N Remove MediaHost from QSPanel
parents 2716a856 ab551329

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/QSContainerImpl.java

+6 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.qs;



import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;

import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;



import android.content.Context;

import android.content.res.Configuration;
@@ -184,7 +183,8 @@ public class QSContainerImpl extends FrameLayout { 
        mBackground.setVisibility(mQsDisabled ? View.GONE : View.VISIBLE);

    }



    void updateResources(QSPanelController qsPanelController) {

    void updateResources(QSPanelController qsPanelController,

            QuickStatusBarHeaderController quickStatusBarHeaderController) {

        LayoutParams layoutParams = (LayoutParams) mQSPanelContainer.getLayoutParams();

        layoutParams.topMargin = mContext.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.quick_qs_offset_height);
@@ -196,7 +196,7 @@ public class QSContainerImpl extends FrameLayout { 
        boolean marginsChanged = padding != mContentPadding;

        mContentPadding = padding;

        if (marginsChanged) {

            updatePaddingsAndMargins(qsPanelController);

            updatePaddingsAndMargins(qsPanelController, quickStatusBarHeaderController);

        }

    }
@@ -252,7 +252,8 @@ public class QSContainerImpl extends FrameLayout { 
        updateExpansion();

    }



    private void updatePaddingsAndMargins(QSPanelController qsPanelController) {

    private void updatePaddingsAndMargins(QSPanelController qsPanelController,

            QuickStatusBarHeaderController quickStatusBarHeaderController) {

        for (int i = 0; i < getChildCount(); i++) {

            View view = getChildAt(i);

            if (view == mQSCustomizer) {
@@ -271,7 +272,7 @@ public class QSContainerImpl extends FrameLayout { 
            } else if (view == mHeader) {

                // The header contains the QQS panel which needs to have special padding, to

                // visually align them.

                mHeader.setContentMargins(mContentPadding, mContentPadding);

                quickStatusBarHeaderController.setContentMargins(mContentPadding, mContentPadding);

            } else {

                view.setPaddingRelative(

                        mContentPadding,

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

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class QSContainerImplController extends ViewController<QSContainerImpl> { 
            new ConfigurationController.ConfigurationListener() {

        @Override

        public void onConfigChanged(Configuration newConfig) {

            mView.updateResources(mQsPanelController);

            mView.updateResources(mQsPanelController, mQuickStatusBarHeaderController);

        }

    };
@@ -60,7 +60,7 @@ public class QSContainerImplController extends ViewController<QSContainerImpl> { 


    @Override

    protected void onViewAttached() {

        mView.updateResources(mQsPanelController);

        mView.updateResources(mQsPanelController, mQuickStatusBarHeaderController);

        mQsPanelController.setMediaVisibilityChangedListener((visible) -> {

            if (mQsPanelController.isShown()) {

                mView.onMediaVisibilityChanged(true);

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

+54 −147
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


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;
@@ -36,13 +35,9 @@ import android.view.View; 
import android.view.ViewGroup;

import android.widget.LinearLayout;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.widget.RemeasuringLinearLayout;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.media.MediaHost;

import com.android.systemui.plugins.qs.DetailAdapter;

import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.qs.logging.QSLogger;
@@ -50,7 +45,6 @@ import com.android.systemui.settings.brightness.BrightnessSlider; 
import com.android.systemui.statusbar.policy.BrightnessMirrorController;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.tuner.TunerService.Tunable;

import com.android.systemui.util.animation.DisappearParameters;



import java.util.ArrayList;

import java.util.List;
@@ -68,7 +62,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
    private static final String TAG = "QSPanel";



    protected final Context mContext;

    private final MediaHost mMediaHost;



    /**

     * The index where the content starts that needs to be moved between parents
@@ -81,7 +74,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
    protected BrightnessSlider mToggleSliderController;



    private final H mHandler = new H();

    private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class);

    /** Whether or not the QS media player feature is enabled. */

    protected boolean mUsingMediaPlayer;

    private int mVisualMarginStart;
@@ -92,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<>();
@@ -108,7 +99,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
    @Nullable

    private ViewGroup mHeaderContainer;

    private PageIndicator mFooterPageIndicator;

    private boolean mGridContentVisible = true;

    private int mContentMarginStart;

    private int mContentMarginEnd;

    private int mVisualTilePadding;
@@ -134,18 +124,14 @@ public class QSPanel extends LinearLayout implements Tunable { 
    public QSPanel(

            @Named(VIEW_CONTEXT) Context context,

            AttributeSet attrs,

            QSLogger qsLogger,

            @Named(QS_PANEL) MediaHost mediaHost,

            UiEventLogger uiEventLogger

            QSLogger qsLogger

    ) {

        super(context, attrs);

        mUsingMediaPlayer = useQsMediaPlayer(context);

        mMediaTotalBottomMargin = getResources().getDimensionPixelSize(

                R.dimen.quick_settings_bottom_margin_media);

        mMediaHost = mediaHost;

        mContext = context;

        mQSLogger = qsLogger;

        mUiEventLogger = uiEventLogger;



        setOrientation(VERTICAL);
@@ -213,36 +199,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
        return createRegularTileLayout();

    }



    /**

     * Update the way the media disappears based on if we're using the horizontal layout

     */

    void updateMediaDisappearParameters() {

        if (!mUsingMediaPlayer) {

            return;

        }

        DisappearParameters parameters = mMediaHost.getDisappearParameters();

        if (mUsingHorizontalLayout) {

            // Only height remaining

            parameters.getDisappearSize().set(0.0f, 0.4f);

            // Disappearing on the right side on the bottom

            parameters.getGonePivot().set(1.0f, 1.0f);

            // translating a bit horizontal

            parameters.getContentTranslationFraction().set(0.25f, 1.0f);

            parameters.setDisappearEnd(0.6f);

        } else {

            // Only width remaining

            parameters.getDisappearSize().set(1.0f, 0.0f);

            // Disappearing on the bottom

            parameters.getGonePivot().set(0.0f, 1.0f);

            // translating a bit vertical

            parameters.getContentTranslationFraction().set(0.0f, 1.05f);

            parameters.setDisappearEnd(0.95f);

        }

        parameters.setFadeStartPosition(0.95f);

        parameters.setDisappearStart(0.0f);

        mMediaHost.setDisappearParameters(parameters);

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        if (mTileLayout instanceof PagedTileLayout) {
@@ -284,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;

    }
@@ -403,65 +351,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
        mDivider = findViewById(R.id.divider);

    }



    boolean switchTileLayout(boolean force, List<QSPanelControllerBase.TileRecord> records) {

        /** Whether or not the QuickQSPanel currently contains a media player. */

        boolean horizontal = shouldUseHorizontalLayout();

        if (mDivider != null) {

            if (!horizontal && mUsingMediaPlayer && mMediaHost.getVisible()) {

                mDivider.setVisibility(View.VISIBLE);

            } else {

                mDivider.setVisibility(View.GONE);

            }

        }

        if (horizontal != mUsingHorizontalLayout || force) {

            mUsingHorizontalLayout = horizontal;

            View visibleView = horizontal ? mHorizontalLinearLayout : (View) mRegularTileLayout;

            View hiddenView = horizontal ? (View) mRegularTileLayout : mHorizontalLinearLayout;

            ViewGroup newParent = horizontal ? mHorizontalContentContainer : this;

            QSTileLayout newLayout = horizontal ? mHorizontalTileLayout : mRegularTileLayout;

            if (hiddenView != null &&

                    (mRegularTileLayout != mHorizontalTileLayout ||

                            hiddenView != mRegularTileLayout)) {

                // Only hide the view if the horizontal and the regular view are different,

                // otherwise its reattached.

                hiddenView.setVisibility(View.GONE);

            }

            visibleView.setVisibility(View.VISIBLE);

            switchAllContentToParent(newParent, newLayout);

            reAttachMediaHost();

            if (mTileLayout != null) {

                mTileLayout.setListening(false);

                for (QSPanelControllerBase.TileRecord record : records) {

                    mTileLayout.removeTile(record);

                    record.tile.removeCallback(record.callback);

                }

            }

            mTileLayout = newLayout;

            if (needsDynamicRowsAndColumns()) {

                newLayout.setMinRows(horizontal ? 2 : 1);

                // Let's use 3 columns to match the current layout

                newLayout.setMaxColumns(horizontal ? 3 : TileLayout.NO_MAX_COLUMNS);

            }

            updateTileLayoutMargins();

            updateFooterMargin();

            updateDividerMargin();

            updateMediaDisappearParameters();

            updateMediaHostContentMargins();

            updateHorizontalLinearLayoutMargins();

            updatePadding();

            return true;

        }

        return false;

    }



    /**

     * Sets the listening state of the current layout to the state of the view. Used after

     * switching layouts.

     */

    public void reSetLayoutListening() {

        mTileLayout.setListening(mListening);

    }



    private void updateHorizontalLinearLayoutMargins() {

        if (mHorizontalLinearLayout != null && !displayMediaMarginsOnMedia()) {

            LayoutParams lp = (LayoutParams) mHorizontalLinearLayout.getLayoutParams();
@@ -524,27 +413,19 @@ public class QSPanel extends LinearLayout implements Tunable { 
        }

    }



    private boolean shouldUseHorizontalLayout() {

        return mUsingMediaPlayer && mMediaHost.getVisible()

                && getResources().getConfiguration().orientation

                == Configuration.ORIENTATION_LANDSCAPE;

    }



    protected void reAttachMediaHost() {

    /** Call when orientation has changed and MediaHost needs to be adjusted. */

    private void reAttachMediaHost(ViewGroup hostView, boolean horizontal) {

        if (!mUsingMediaPlayer) {

            return;

        }

        boolean horizontal = shouldUseHorizontalLayout();

        ViewGroup host = mMediaHost.getHostView();



        ViewGroup newParent = horizontal ? mHorizontalLinearLayout : this;

        ViewGroup currentParent = (ViewGroup) host.getParent();

        ViewGroup currentParent = (ViewGroup) hostView.getParent();

        if (currentParent != newParent) {

            if (currentParent != null) {

                currentParent.removeView(host);

                currentParent.removeView(hostView);

            }

            newParent.addView(host);

            LinearLayout.LayoutParams layoutParams = (LayoutParams) host.getLayoutParams();

            newParent.addView(hostView);

            LinearLayout.LayoutParams layoutParams = (LayoutParams) hostView.getLayoutParams();

            layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT;

            layoutParams.width = horizontal ? 0 : ViewGroup.LayoutParams.MATCH_PARENT;

            layoutParams.weight = horizontal ? 1.2f : 0;
@@ -576,16 +457,10 @@ 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];

        int yInWindow = locationInWindow[1];
@@ -728,14 +603,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
        fireScanStateChanged(scanState);

    }



    void setGridContentVisibility(boolean visible) {

        int newVis = visible ? VISIBLE : INVISIBLE;

        setVisibility(newVis);

        if (mGridContentVisible != visible) {

            mMetricsLogger.visibility(MetricsEvent.QS_PANEL, newVis);

        }

        mGridContentVisible = visible;

    }

    private void fireShowingDetail(DetailAdapter detail, int x, int y) {

        if (mCallback != null) {

            mCallback.onShowingDetail(detail, x, y);
@@ -763,14 +630,15 @@ public class QSPanel extends LinearLayout implements Tunable { 
        return mDivider;

    }



    public void setContentMargins(int startMargin, int endMargin) {

    /** */

    public void setContentMargins(int startMargin, int endMargin, ViewGroup mediaHostView) {

        // Only some views actually want this content padding, others want to go all the way

        // to the edge like the brightness slider

        mContentMarginStart = startMargin;

        mContentMarginEnd = endMargin;

        updateTileLayoutMargins(mContentMarginStart - mVisualTilePadding,

                mContentMarginEnd - mVisualTilePadding);

        updateMediaHostContentMargins();

        updateMediaHostContentMargins(mediaHostView);

        updateFooterMargin();

        updateDividerMargin();

    }
@@ -826,13 +694,13 @@ public class QSPanel extends LinearLayout implements Tunable { 
    /**

     * Update the margins of the media hosts

     */

    protected void updateMediaHostContentMargins() {

    protected void updateMediaHostContentMargins(ViewGroup mediaHostView) {

        if (mUsingMediaPlayer) {

            int marginStart = mContentMarginStart;

            if (mUsingHorizontalLayout) {

                marginStart = 0;

            }

            updateMargins(mMediaHost.getHostView(), marginStart, mContentMarginEnd);

            updateMargins(mediaHostView, marginStart, mContentMarginEnd);

        }

    }
@@ -871,6 +739,45 @@ public class QSPanel extends LinearLayout implements Tunable { 
        mSecurityFooter = view;

    }



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

            UiEventLogger uiEventLogger) {

        if (horizontal != mUsingHorizontalLayout || force) {

            mUsingHorizontalLayout = horizontal;

            View visibleView = horizontal ? mHorizontalLinearLayout : (View) mRegularTileLayout;

            View hiddenView = horizontal ? (View) mRegularTileLayout : mHorizontalLinearLayout;

            ViewGroup newParent = horizontal ? mHorizontalContentContainer : this;

            QSPanel.QSTileLayout newLayout = horizontal

                    ? mHorizontalTileLayout : mRegularTileLayout;

            if (hiddenView != null

                    && (mRegularTileLayout != mHorizontalTileLayout

                    || hiddenView != mRegularTileLayout)) {

                // Only hide the view if the horizontal and the regular view are different,

                // otherwise its reattached.

                hiddenView.setVisibility(View.GONE);

            }

            visibleView.setVisibility(View.VISIBLE);

            switchAllContentToParent(newParent, newLayout);

            reAttachMediaHost(mediaHostView, horizontal);

            mTileLayout = newLayout;

            newLayout.setListening(mListening, uiEventLogger);

            if (needsDynamicRowsAndColumns()) {

                newLayout.setMinRows(horizontal ? 2 : 1);

                // Let's use 3 columns to match the current layout

                newLayout.setMaxColumns(horizontal ? 3 : TileLayout.NO_MAX_COLUMNS);

            }

            updateMargins(mediaHostView);

        }

    }



    private void updateMargins(ViewGroup mediaHostView) {

        updateTileLayoutMargins();

        updateFooterMargin();

        updateDividerMargin();

        updateMediaHostContentMargins(mediaHostView);

        updateHorizontalLinearLayoutMargins();

        updatePadding();

    }



    private class H extends Handler {

        private static final int SHOW_DETAIL = 1;

        private static final int SET_TILE_VISIBILITY = 2;
@@ -912,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
@@ -924,7 +831,7 @@ public class QSPanel extends LinearLayout implements Tunable { 
        }



        /**

         * Set the max number of collums to show

         * Set the max number of columns to show

         *

         * @param maxColumns the maximum

         *