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

Commit 8384dadb authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Move ColorExtractor.OnColorsChangedListener to inside of StatusBar."... 

Merge "Move ColorExtractor.OnColorsChangedListener to inside of StatusBar." into sc-v2-dev am: 02dc7196

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

Change-Id: I3dba572c8aa611d7c35b277a607081580602c39e
parents 99bbc93f 02dc7196

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+5 −7
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ import dagger.Lazy; 
/** */

public class StatusBar extends SystemUI implements

        ActivityStarter,

        ColorExtractor.OnColorsChangedListener, ConfigurationListener,

        ConfigurationListener,

        StatusBarStateController.StateListener,

        LifecycleOwner, BatteryController.BatteryStateChangeCallback,

        ActivityLaunchAnimator.Callback {
@@ -774,6 +774,9 @@ public class StatusBar extends SystemUI implements 
    private final ActivityIntentHelper mActivityIntentHelper;

    private NotificationStackScrollLayoutController mStackScrollerController;



    private final ColorExtractor.OnColorsChangedListener mOnColorsChangedListener =

            (extractor, which) -> updateTheme();



    /**

     * Public constructor for StatusBar.

     *
@@ -981,7 +984,7 @@ public class StatusBar extends SystemUI implements 


        mKeyguardIndicationController.init();



        mColorExtractor.addOnColorsChangedListener(this);

        mColorExtractor.addOnColorsChangedListener(mOnColorsChangedListener);

        mStatusBarStateController.addCallback(this,

                SysuiStatusBarStateController.RANK_STATUS_BAR);
@@ -1896,11 +1899,6 @@ public class StatusBar extends SystemUI implements 
        return mNotificationPanelViewController.hideStatusBarIconsWhenExpanded();

    }



    @Override

    public void onColorsChanged(ColorExtractor extractor, int which) {

        updateTheme();

    }



    @Nullable

    public View getAmbientIndicationContainer() {

        return mAmbientIndicationContainer;