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

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

Merge "Move ColorExtractor.OnColorsChangedListener to inside of StatusBar." into sc-v2-dev

parents 54889a31 5daa1ce5
Loading
Loading
Loading
Loading
+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);

@@ -1895,11 +1898,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;