75 lines
3.5 KiB
Diff
75 lines
3.5 KiB
Diff
From 708976d1ac2ea6cbf3498f546e53488736dfd471 Mon Sep 17 00:00:00 2001
|
|
From: SagarMakhar <sagarmakhar@gmail.com>
|
|
Date: Sat, 6 Nov 2021 13:16:24 +0000
|
|
Subject: [PATCH 22/22] Fix QS clock being white on light theme
|
|
|
|
Steps to reproduce without this commit:
|
|
- Turn off dark theme
|
|
- Play a song and wait for media player to show in QS
|
|
- Confirm clock text color is white
|
|
|
|
Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
|
|
Change-Id: I62aeba57e1ce458c73752faa1c9d80d26a63f625
|
|
Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
|
|
---
|
|
.../systemui/qs/QuickStatusBarHeaderController.java | 13 -------------
|
|
1 file changed, 13 deletions(-)
|
|
|
|
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
|
|
index 2dc4ee4e0064..c9e9b2ad69d0 100644
|
|
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
|
|
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
|
|
@@ -18,10 +18,8 @@ package com.android.systemui.qs;
|
|
|
|
import android.os.Bundle;
|
|
|
|
-import com.android.internal.colorextraction.ColorExtractor;
|
|
import com.android.systemui.R;
|
|
import com.android.systemui.battery.BatteryMeterViewController;
|
|
-import com.android.systemui.colorextraction.SysuiColorExtractor;
|
|
import com.android.systemui.demomode.DemoMode;
|
|
import com.android.systemui.demomode.DemoModeController;
|
|
import com.android.systemui.flags.FeatureFlags;
|
|
@@ -64,9 +62,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
|
|
|
|
private boolean mListening;
|
|
|
|
- private SysuiColorExtractor mColorExtractor;
|
|
- private ColorExtractor.OnColorsChangedListener mOnColorsChangedListener;
|
|
-
|
|
@Inject
|
|
QuickStatusBarHeaderController(QuickStatusBarHeader view,
|
|
HeaderPrivacyIconsController headerPrivacyIconsController,
|
|
@@ -74,7 +69,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
|
|
DemoModeController demoModeController,
|
|
QuickQSPanelController quickQSPanelController,
|
|
QSCarrierGroupController.Builder qsCarrierGroupControllerBuilder,
|
|
- SysuiColorExtractor colorExtractor,
|
|
QSExpansionPathInterpolator qsExpansionPathInterpolator,
|
|
BatteryMeterViewController batteryMeterViewController,
|
|
FeatureFlags featureFlags,
|
|
@@ -104,12 +98,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
|
|
|
|
mIconManager = new StatusBarIconController.TintedIconManager(mIconContainer, featureFlags);
|
|
mDemoModeReceiver = new ClockDemoModeReceiver(mClockView);
|
|
- mColorExtractor = colorExtractor;
|
|
- mOnColorsChangedListener = (extractor, which) -> {
|
|
- final boolean lightTheme = mColorExtractor.getNeutralColors().supportsDarkText();
|
|
- mClockView.onColorsChanged(lightTheme);
|
|
- };
|
|
- mColorExtractor.addOnColorsChangedListener(mOnColorsChangedListener);
|
|
|
|
// Don't need to worry about tuner settings for this icon
|
|
mBatteryMeterViewController.ignoreTunerUpdates();
|
|
@@ -157,7 +145,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
|
|
|
|
@Override
|
|
protected void onViewDetached() {
|
|
- mColorExtractor.removeOnColorsChangedListener(mOnColorsChangedListener);
|
|
mPrivacyIconsController.onParentInvisible();
|
|
mStatusBarIconController.removeIconGroup(mIconManager);
|
|
mQSCarrierGroupController.setOnSingleCarrierChangedListener(null);
|
|
--
|
|
2.25.1
|
|
|