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

Commit 7a6e869b authored by Michael Rosenfeld's avatar Michael Rosenfeld
Browse files

Revert "7/N Inject media hosts directly." 

This reverts commit 3b423157.

Reason for revert: Parent change causing breakage in QSPanel.

Change-Id: I5630fc05c4e0955ffc5f8cb9d23766e65c3dea8a
parent 3b423157

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

+5 −12
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 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;
@@ -53,7 +50,6 @@ 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 {
@@ -86,8 +82,6 @@ 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;
@@ -110,15 +104,12 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
    public QSFragment(RemoteInputQuickSettingsDisabler remoteInputQsDisabler,

            InjectionInflationController injectionInflater, QSTileHost qsTileHost,

            StatusBarStateController statusBarStateController, CommandQueue commandQueue,

            QSDetailDisplayer qsDetailDisplayer, @Named(QS_PANEL) MediaHost qsMediaHost,

            @Named(QUICK_QS_PANEL) MediaHost qqsMediaHost,

            QSDetailDisplayer qsDetailDisplayer,

            QSFragmentComponent.Factory qsComponentFactory) {

        mRemoteInputQuickSettingsDisabler = remoteInputQsDisabler;

        mInjectionInflater = injectionInflater;

        mCommandQueue = commandQueue;

        mQsDetailDisplayer = qsDetailDisplayer;

        mQsMediaHost = qsMediaHost;

        mQqsMediaHost = qqsMediaHost;

        mQsComponentFactory = qsComponentFactory;

        commandQueue.observe(getLifecycle(), this);

        mHost = qsTileHost;
@@ -463,9 +454,11 @@ 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, mQsMediaHost, true /* expanded */);

            pinToBottom(

                    expandedMediaPosition, mQSPanelController.getMediaHost(), true /* expanded */);

            // The expanded media host should never move above the laid out position

            pinToBottom(absoluteBottomPosition, mQqsMediaHost, false /* expanded */);

            pinToBottom(absoluteBottomPosition, mHeader.getHeaderQsPanel().getMediaHost(),

                    false /* expanded */);

        }

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ 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) {
@@ -866,6 +865,10 @@ 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,7 +16,6 @@ 


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;
@@ -41,7 +40,6 @@ import com.android.systemui.tuner.TunerService; 
import java.util.function.Consumer;



import javax.inject.Inject;

import javax.inject.Named;



/**

 * Controller for {@link QSPanel}.
@@ -76,13 +74,11 @@ 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, mediaHost, metricsLogger, uiEventLogger,

                dumpManager);

        super(view, qstileHost, qsCustomizerController, metricsLogger, uiEventLogger, dumpManager);

        mQsSecurityFooter = qsSecurityFooter;

        mTunerService = tunerService;

        mQsCustomizerController = qsCustomizerController;
@@ -98,7 +94,6 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 


    @Override

    public void onInit() {

        super.init();

        mQsCustomizerController.init();

        mBrightnessSlider.init();

    }
@@ -170,6 +165,11 @@ 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

+4 −2
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, MediaHost mediaHost,

            QSCustomizerController qsCustomizerController,

            MetricsLogger metricsLogger, UiEventLogger uiEventLogger, DumpManager dumpManager) {

        super(view);

        mHost = host;

        mQsCustomizerController = qsCustomizerController;

        mMediaHost = mediaHost;

        mMediaHost = mView.getMediaHost();

        mMetricsLogger = metricsLogger;

        mUiEventLogger = uiEventLogger;

        mDumpManager = dumpManager;
@@ -193,6 +193,7 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr 
                .collect(Collectors.joining(","));

    }





    /** */

    public void setExpanded(boolean expanded) {

        mView.setExpanded(expanded);
@@ -234,6 +235,7 @@ 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

+1 −7
Original line number Diff line number Diff line
@@ -16,13 +16,10 @@ 


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;
@@ -31,7 +28,6 @@ import java.util.ArrayList; 
import java.util.List;



import javax.inject.Inject;

import javax.inject.Named;



/** Controller for {@link QuickQSPanel}. */

@QSScope
@@ -50,11 +46,9 @@ 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, mediaHost, metricsLogger, uiEventLogger,

                dumpManager);

        super(view, qsTileHost, qsCustomizerController, metricsLogger, uiEventLogger, dumpManager);

    }



    @Override