summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matías Hernández <matiashe@google.com> 2024-09-02 11:06:30 +0200
committer Matías Hernández <matiashe@google.com> 2024-09-02 22:09:47 +0000
commitb8b96b5e398e5c775bfe80bcb46517644ee45c34 (patch)
tree691a959aee56c02630fb1a5a9c6a17cc6a21af95
parentfe76b1d0c87e9556daad7264ef7689dcb692d19a (diff)
Don't set non-FIXED_SPACE StatusBarIconViews to CENTER
They might be CENTER or CENTER_INSIDE, depending on who created it (e.g. CENTER_INSIDE in aod as created by IconManager.kt). Bug: 360399800 Test: atest NotificationIconContainerScreenshotTest + abtd Flag: android.app.modes_ui Change-Id: I4a82429bd4040d64f2436bdec743318229e45b49
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index 2b44c2f9ea7f..87f360eb9712 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -415,8 +415,8 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
if (!levelEquals) {
setImageLevel(icon.iconLevel);
}
- if (usesModeIcons()) {
- setScaleType(icon.shape == Shape.FIXED_SPACE ? ScaleType.FIT_CENTER : ScaleType.CENTER);
+ if (usesModeIcons() && icon.shape == Shape.FIXED_SPACE) {
+ setScaleType(ScaleType.FIT_CENTER);
}
if (!visibilityEquals) {
setVisibility(icon.visible && !mBlocked ? VISIBLE : GONE);