73 lines
3.6 KiB
Diff
73 lines
3.6 KiB
Diff
From 00463f495ad23afddbf5bc0b4c227e63d09bc8e4 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>
|
|
---
|
|
.../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 18d6e646b007..7aa668440b4b 100644
|
|
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
|
|
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
|
|
@@ -22,10 +22,8 @@ import android.view.View.OnClickListener;
|
|
|
|
import androidx.annotation.NonNull;
|
|
|
|
-import com.android.internal.colorextraction.ColorExtractor;
|
|
import com.android.internal.logging.UiEventLogger;
|
|
import com.android.systemui.R;
|
|
-import com.android.systemui.colorextraction.SysuiColorExtractor;
|
|
import com.android.systemui.demomode.DemoMode;
|
|
import com.android.systemui.demomode.DemoModeController;
|
|
import com.android.systemui.plugins.ActivityStarter;
|
|
@@ -83,9 +81,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
|
|
private final String mMicSlot;
|
|
private final String mLocationSlot;
|
|
|
|
- private SysuiColorExtractor mColorExtractor;
|
|
- private ColorExtractor.OnColorsChangedListener mOnColorsChangedListener;
|
|
-
|
|
private PrivacyItemController.Callback mPICCallback = new PrivacyItemController.Callback() {
|
|
@Override
|
|
public void onPrivacyItemsChanged(@NonNull List<PrivacyItem> privacyItems) {
|
|
@@ -135,7 +130,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
|
|
QuickQSPanelController quickQSPanelController,
|
|
QSCarrierGroupController.Builder qsCarrierGroupControllerBuilder,
|
|
PrivacyLogger privacyLogger,
|
|
- SysuiColorExtractor colorExtractor,
|
|
PrivacyDialogController privacyDialogController,
|
|
QSExpansionPathInterpolator qsExpansionPathInterpolator,
|
|
FeatureFlags featureFlags,
|
|
@@ -168,12 +162,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);
|
|
|
|
mCameraSlot = getResources().getString(com.android.internal.R.string.status_bar_camera);
|
|
mMicSlot = getResources().getString(com.android.internal.R.string.status_bar_microphone);
|
|
@@ -223,7 +211,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
|
|
|
|
@Override
|
|
protected void onViewDetached() {
|
|
- mColorExtractor.removeOnColorsChangedListener(mOnColorsChangedListener);
|
|
mPrivacyChip.setOnClickListener(null);
|
|
mStatusBarIconController.removeIconGroup(mIconManager);
|
|
mQSCarrierGroupController.setOnSingleCarrierChangedListener(null);
|
|
--
|
|
2.25.1
|
|
|