Revert "Avoid adding transparency to Shelf Background View"
This reverts commit f7e839659f3c9f4f3370bdfd475d537054b1be6d.
Reason for revert: Regression (b/425383239). ag/33919549 already fixes the original bug b/420181235
Bug: 420181235
Bug: 425383239
Change-Id: I55137774d0391967d8037fe2418db0e6a6a41429
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java
index 8a2aa17..a198758 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java
@@ -24,6 +24,7 @@
import android.graphics.Canvas;
import android.graphics.Path;
import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
@@ -86,7 +87,7 @@
R.color.notification_state_color_light);
mDarkColoredStatefulColors = getResources().getColorStateList(
R.color.notification_state_color_dark);
- if (backgroundTransparency()) {
+ if (notificationRowTransparency()) {
mNormalColor = SurfaceEffectColors.surfaceEffect1(getContext());
} else {
mNormalColor = mContext.getColor(
@@ -107,13 +108,6 @@
}
}
- /**
- * @return Whether to apply transparency to the background.
- */
- protected boolean backgroundTransparency() {
- return notificationRowTransparency();
- }
-
@Override
protected void onDraw(Canvas canvas) {
float clipTop = Math.max(mClipTopAmount, mTopOverlap);
@@ -307,7 +301,7 @@
public void setTint(int tintColor) {
Drawable baseLayer = getBaseBackgroundLayer();
- if (backgroundTransparency()) {
+ if (notificationRowTransparency()) {
((GradientDrawable) baseLayer.mutate()).setColor(tintColor);
} else {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/NotificationShelfBackgroundView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/NotificationShelfBackgroundView.kt
index a471a4f..d7eea01 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/NotificationShelfBackgroundView.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/NotificationShelfBackgroundView.kt
@@ -43,8 +43,4 @@
override fun toDumpString(): String {
return super.toDumpString() + " alignToEnd=" + alignToEnd
}
-
- override fun backgroundTransparency(): Boolean {
- return false
- }
}
