108 lines
5.2 KiB
Diff
108 lines
5.2 KiB
Diff
From d9afc7a0cee04b08f20a16abc23384cf4e1028d8 Mon Sep 17 00:00:00 2001
|
|
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
|
Date: Tue, 29 Jun 2021 23:01:07 +0000
|
|
Subject: [PATCH] UI: Force dark QS scrim
|
|
|
|
Side effect from using light wallpapers
|
|
|
|
Change-Id: I241dfd7cf8d8bfce1503e7872c5359c380fdbfed
|
|
---
|
|
.../systemui/qs/QuickStatusBarHeader.java | 5 -----
|
|
.../stack/NotificationStackScrollLayout.java | 2 +-
|
|
.../statusbar/phone/ScrimController.java | 21 ++++++-------------
|
|
3 files changed, 7 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
|
|
index d4a1f1877b2..5623c78d535 100644
|
|
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
|
|
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
|
|
@@ -376,11 +376,6 @@ public class QuickStatusBarHeader extends RelativeLayout implements
|
|
protected void onConfigurationChanged(Configuration newConfig) {
|
|
super.onConfigurationChanged(newConfig);
|
|
updateResources();
|
|
-
|
|
- // Update color schemes in landscape to use wallpaperTextColor
|
|
- boolean shouldUseWallpaperTextColor =
|
|
- newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE;
|
|
- mClockView.useWallpaperTextColor(shouldUseWallpaperTextColor);
|
|
}
|
|
|
|
@Override
|
|
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
|
|
index 389033f6657..a30940da5d8 100644
|
|
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
|
|
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
|
|
@@ -674,7 +674,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
|
|
@Override
|
|
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
|
|
public void onThemeChanged() {
|
|
- final boolean useDarkText = mColorExtractor.getNeutralColors().supportsDarkText();
|
|
+ final boolean useDarkText = false;
|
|
updateDecorViews(useDarkText);
|
|
|
|
updateFooter();
|
|
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
|
|
index dee8c0f8ef6..5f591cfed16 100644
|
|
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
|
|
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
|
|
@@ -36,9 +36,7 @@ import android.view.animation.DecelerateInterpolator;
|
|
import android.view.animation.Interpolator;
|
|
|
|
import com.android.internal.annotations.VisibleForTesting;
|
|
-import com.android.internal.colorextraction.ColorExtractor;
|
|
import com.android.internal.colorextraction.ColorExtractor.GradientColors;
|
|
-import com.android.internal.colorextraction.ColorExtractor.OnColorsChangedListener;
|
|
import com.android.internal.graphics.ColorUtils;
|
|
import com.android.internal.util.function.TriConsumer;
|
|
import com.android.keyguard.KeyguardUpdateMonitor;
|
|
@@ -64,8 +62,7 @@ import java.util.function.Consumer;
|
|
* Controls both the scrim behind the notifications and in front of the notifications (when a
|
|
* security method gets shown).
|
|
*/
|
|
-public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnColorsChangedListener,
|
|
- Dumpable {
|
|
+public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dumpable {
|
|
|
|
static final String TAG = "ScrimController";
|
|
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
|
|
@@ -134,7 +131,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
|
|
private final KeyguardVisibilityCallback mKeyguardVisibilityCallback;
|
|
private final Handler mHandler;
|
|
|
|
- private final SysuiColorExtractor mColorExtractor;
|
|
private GradientColors mColors;
|
|
private boolean mNeedsDrawableColorUpdate;
|
|
|
|
@@ -208,9 +204,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
|
|
}
|
|
});
|
|
|
|
- mColorExtractor = Dependency.get(SysuiColorExtractor.class);
|
|
- mColorExtractor.addOnColorsChangedListener(this);
|
|
- mColors = mColorExtractor.getNeutralColors();
|
|
+ mColors = new GradientColors();
|
|
+ mColors.setMainColor(-14671580);
|
|
+ mColors.setSecondaryColor(-14671580);
|
|
+ mColors.setColorPalette(new int[] {-14671580});
|
|
+ mColors.setSupportsDarkText(false);
|
|
mNeedsDrawableColorUpdate = true;
|
|
|
|
final ScrimState[] states = ScrimState.values();
|
|
@@ -896,13 +894,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
|
|
// Don't care in the base class.
|
|
}
|
|
|
|
- @Override
|
|
- public void onColorsChanged(ColorExtractor colorExtractor, int which) {
|
|
- mColors = mColorExtractor.getNeutralColors();
|
|
- mNeedsDrawableColorUpdate = true;
|
|
- scheduleUpdate();
|
|
- }
|
|
-
|
|
@VisibleForTesting
|
|
protected WakeLock createWakeLock() {
|
|
return new DelayedWakeLock(mHandler, WakeLock.createPartial(mContext, "Scrims"));
|
|
--
|
|
2.25.1
|
|
|