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

Commit d25529c2 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 am: 8384dadb

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

Change-Id: Ie8f96d0160b18bd92888ed916255a7b936d44f45
parents 4510fcd0 8384dadb

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

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

public class StatusBar extends SystemUI implements

        ActivityStarter,

        ColorExtractor.OnColorsChangedListener, ConfigurationListener,

        ConfigurationListener,

        StatusBarStateController.StateListener,

        LifecycleOwner, BatteryController.BatteryStateChangeCallback,

        ActivityLaunchAnimator.Callback {
@@ -776,6 +776,9 @@ public class StatusBar extends SystemUI implements 
    private NotificationStackScrollLayoutController mStackScrollerController;

    private BatteryMeterViewController mBatteryMeterViewController;



    private final ColorExtractor.OnColorsChangedListener mOnColorsChangedListener =

            (extractor, which) -> updateTheme();



    /**

     * Public constructor for StatusBar.

     *
@@ -983,7 +986,7 @@ public class StatusBar extends SystemUI implements 


        mKeyguardIndicationController.init();



        mColorExtractor.addOnColorsChangedListener(this);

        mColorExtractor.addOnColorsChangedListener(mOnColorsChangedListener);

        mStatusBarStateController.addCallback(this,

                SysuiStatusBarStateController.RANK_STATUS_BAR);
@@ -1902,11 +1905,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;