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

Commit 3d3a6957 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Making mirror slider appear when brightness slider is... 

Merge "Revert "Revert "Making mirror slider appear when brightness slider is used in split shade""" into sc-v2-dev am: ed4d4329

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15432522

Change-Id: I9acaa75f44f3ce48446b7bc135ad0c3062a625c7
parents 39326cd0 ed4d4329

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

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.systemui.statusbar.StatusBarState; 
import com.android.systemui.statusbar.notification.stack.StackStateAnimator;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer;

import com.android.systemui.statusbar.policy.BrightnessMirrorController;

import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;

import com.android.systemui.util.InjectionInflationController;

import com.android.systemui.util.LifecycleFragment;
@@ -407,6 +408,12 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        return mQSPanelController;

    }



    public void setBrightnessMirrorController(

            BrightnessMirrorController brightnessMirrorController) {

        mQSPanelController.setBrightnessMirror(brightnessMirrorController);

        mQuickQSPanelController.setBrightnessMirror(brightnessMirrorController);

    }



    @Override

    public boolean isShowingDetail() {

        return mQSCustomizerController.isCustomizing() || mQSDetail.isShowingDetail();

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

+7 −30
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 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.BrightnessMirrorHandler;

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

import com.android.systemui.statusbar.policy.BrightnessMirrorController;

import com.android.systemui.tuner.TunerService;
@@ -60,10 +61,9 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
    private final QSTileRevealController.Factory mQsTileRevealControllerFactory;

    private final FalsingManager mFalsingManager;

    private final BrightnessController mBrightnessController;

    private final BrightnessSlider.Factory mBrightnessSliderFactory;

    private final BrightnessSlider mBrightnessSlider;

    private final BrightnessMirrorHandler mBrightnessMirrorHandler;



    private BrightnessMirrorController mBrightnessMirrorController;

    private boolean mGridContentVisible = true;



    private final QSPanel.OnConfigurationChangedListener mOnConfigurationChangedListener =
@@ -75,14 +75,10 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
            if (mView.isListening()) {

                refreshAllTiles();

            }

            updateBrightnessMirror();

            mView.switchSecurityFooter(mShouldUseSplitNotificationShade);

        }

    };



    private final BrightnessMirrorController.BrightnessMirrorListener mBrightnessMirrorListener =

            mirror -> updateBrightnessMirror();



    private View.OnTouchListener mTileLayoutTouchListener = new View.OnTouchListener() {

        @Override

        public boolean onTouch(View v, MotionEvent event) {
@@ -110,12 +106,12 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
        mQsTileRevealControllerFactory = qsTileRevealControllerFactory;

        mFalsingManager = falsingManager;

        mQsSecurityFooter.setHostEnvironment(qstileHost);

        mBrightnessSliderFactory = brightnessSliderFactory;



        mBrightnessSlider = mBrightnessSliderFactory.create(getContext(), mView);

        mBrightnessSlider = brightnessSliderFactory.create(getContext(), mView);

        mView.setBrightnessView(mBrightnessSlider.getRootView());



        mBrightnessController = brightnessControllerFactory.create(mBrightnessSlider);

        mBrightnessMirrorHandler = new BrightnessMirrorHandler(mBrightnessController);

    }



    @Override
@@ -142,9 +138,7 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
        mView.addOnConfigurationChangedListener(mOnConfigurationChangedListener);

        mView.setSecurityFooter(mQsSecurityFooter.getView(), mShouldUseSplitNotificationShade);

        switchTileLayout(true);

        if (mBrightnessMirrorController != null) {

            mBrightnessMirrorController.addCallback(mBrightnessMirrorListener);

        }

        mBrightnessMirrorHandler.onQsPanelAttached();



        ((PagedTileLayout) mView.getOrCreateTileLayout())

                .setOnTouchListener(mTileLayoutTouchListener);
@@ -160,9 +154,7 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
    protected void onViewDetached() {

        mTunerService.removeTunable(mView);

        mView.removeOnConfigurationChangedListener(mOnConfigurationChangedListener);

        if (mBrightnessMirrorController != null) {

            mBrightnessMirrorController.removeCallback(mBrightnessMirrorListener);

        }

        mBrightnessMirrorHandler.onQsPanelDettached();

        super.onViewDetached();

    }
@@ -196,23 +188,8 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
        }

    }



    /** */

    public void setBrightnessMirror(BrightnessMirrorController brightnessMirrorController) {

        mBrightnessMirrorController = brightnessMirrorController;

        if (mBrightnessMirrorController != null) {

            mBrightnessMirrorController.removeCallback(mBrightnessMirrorListener);

        }

        mBrightnessMirrorController = brightnessMirrorController;

        if (mBrightnessMirrorController != null) {

            mBrightnessMirrorController.addCallback(mBrightnessMirrorListener);

        }

        updateBrightnessMirror();

    }



    private void updateBrightnessMirror() {

        if (mBrightnessMirrorController != null) {

            mBrightnessSlider.setMirrorControllerAndMirror(mBrightnessMirrorController);

        }

        mBrightnessMirrorHandler.setController(brightnessMirrorController);

    }



    /** Get the QSTileHost this panel uses. */

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

+12 −5
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.systemui.qs 
import androidx.annotation.VisibleForTesting

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

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

import com.android.systemui.settings.brightness.MirroredBrightnessController

import com.android.systemui.statusbar.policy.BrightnessMirrorController

import javax.inject.Inject



/**
@@ -27,7 +29,7 @@ import javax.inject.Inject 
 */

class QuickQSBrightnessController @VisibleForTesting constructor(

    private val brightnessControllerFactory: () -> BrightnessController

) {

) : MirroredBrightnessController {



    @Inject constructor(

        brightnessControllerFactory: BrightnessController.Factory,
@@ -42,6 +44,7 @@ class QuickQSBrightnessController @VisibleForTesting constructor( 


    private var isListening = false

    private var brightnessController: BrightnessController? = null

    private var mirrorController: BrightnessMirrorController? = null



    fun init(shouldUseSplitNotificationShade: Boolean) {

        refreshVisibility(shouldUseSplitNotificationShade)
@@ -77,6 +80,11 @@ class QuickQSBrightnessController @VisibleForTesting constructor( 
        }

    }



    override fun setMirror(controller: BrightnessMirrorController) {

        mirrorController = controller

        mirrorController?.let { brightnessController?.setMirror(it) }

    }



    private fun hideBrightnessSlider() {

        brightnessController?.hideSlider()

    }
@@ -84,11 +92,10 @@ class QuickQSBrightnessController @VisibleForTesting constructor( 
    private fun showBrightnessSlider() {

        if (brightnessController == null) {

            brightnessController = brightnessControllerFactory()

        }

        brightnessController?.showSlider()

        if (!isListening) {

            mirrorController?.also { brightnessController?.setMirror(it) }

            brightnessController?.registerCallbacks()

            isListening = true

        }

        brightnessController?.showSlider()

    }

}

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

+10 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 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.BrightnessMirrorHandler;

import com.android.systemui.statusbar.policy.BrightnessMirrorController;



import java.util.ArrayList;

import java.util.List;
@@ -50,6 +52,7 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> 


    // brightness is visible only in split shade

    private final QuickQSBrightnessController mBrightnessController;

    private final BrightnessMirrorHandler mBrightnessMirrorHandler;



    @Inject

    QuickQSPanelController(QuickQSPanel view, QSTileHost qsTileHost,
@@ -63,6 +66,7 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> 
        super(view, qsTileHost, qsCustomizerController, usingMediaPlayer, mediaHost, metricsLogger,

                uiEventLogger, qsLogger, dumpManager);

        mBrightnessController = quickQSBrightnessController;

        mBrightnessMirrorHandler = new BrightnessMirrorHandler(mBrightnessController);

    }



    @Override
@@ -78,12 +82,14 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> 
    protected void onViewAttached() {

        super.onViewAttached();

        mView.addOnConfigurationChangedListener(mOnConfigurationChangedListener);

        mBrightnessMirrorHandler.onQsPanelAttached();

    }



    @Override

    protected void onViewDetached() {

        super.onViewDetached();

        mView.removeOnConfigurationChangedListener(mOnConfigurationChangedListener);

        mBrightnessMirrorHandler.onQsPanelDettached();

    }



    @Override
@@ -132,4 +138,8 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> 
    public int getNumQuickTiles() {

        return mView.getNumQuickTiles();

    }



    public void setBrightnessMirror(BrightnessMirrorController brightnessMirrorController) {

        mBrightnessMirrorHandler.setController(brightnessMirrorController);

    }

}

packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java

+7 −1
Original line number Diff line number Diff line
@@ -50,12 +50,13 @@ import com.android.settingslib.RestrictedLockUtilsInternal; 
import com.android.systemui.Dependency;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.settings.CurrentUserTracker;

import com.android.systemui.statusbar.policy.BrightnessMirrorController;



import java.util.ArrayList;



import javax.inject.Inject;



public class BrightnessController implements ToggleSlider.Listener {

public class BrightnessController implements ToggleSlider.Listener, MirroredBrightnessController {

    private static final String TAG = "StatusBar.BrightnessController";

    private static final int SLIDER_ANIMATION_DURATION = 3000;
@@ -109,6 +110,11 @@ public class BrightnessController implements ToggleSlider.Listener { 


    private ValueAnimator mSliderAnimator;



    @Override

    public void setMirror(BrightnessMirrorController controller) {

        mControl.setMirrorControllerAndMirror(controller);

    }



    public interface BrightnessStateChangeCallback {

        /** Indicates that some of the brightness settings have changed */

        void onBrightnessLevelChanged();