Merge "Fix bug where notification text colors stop updating"

This commit is contained in:
Lyn Han
2020-11-12 18:38:27 +00:00
committed by Android (Google) Code Review

View File

@@ -48,6 +48,7 @@ import android.view.WindowInsets;
import android.widget.FrameLayout;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.colorextraction.ColorExtractor;
import com.android.internal.jank.InteractionJankMonitor;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.UiEvent;
@@ -177,6 +178,8 @@ public class NotificationStackScrollLayoutController {
private final NotificationListContainerImpl mNotificationListContainer =
new NotificationListContainerImpl();
private ColorExtractor.OnColorsChangedListener mOnColorsChangedListener;
@VisibleForTesting
final View.OnAttachStateChangeListener mOnAttachStateChangeListener =
new View.OnAttachStateChangeListener() {
@@ -703,10 +706,11 @@ public class NotificationStackScrollLayoutController {
Settings.Secure.NOTIFICATION_DISMISS_RTL,
Settings.Secure.NOTIFICATION_HISTORY_ENABLED);
mColorExtractor.addOnColorsChangedListener((colorExtractor, which) -> {
mOnColorsChangedListener = (colorExtractor, which) -> {
final boolean useDarkText = mColorExtractor.getNeutralColors().supportsDarkText();
mView.updateDecorViews(useDarkText);
});
};
mColorExtractor.addOnColorsChangedListener(mOnColorsChangedListener);
mKeyguardMediaController.setVisibilityChangedListener(visible -> {
mView.setKeyguardMediaControllorVisible(visible);