diff options
| author | 2024-04-09 19:56:19 +0000 | |
|---|---|---|
| committer | 2024-04-09 19:56:19 +0000 | |
| commit | ddc675dc746b0fffd44a3ef03bc72f9c4c6a1845 (patch) | |
| tree | a17ec043736d12cb1606afc2e5b8f1cf418599ce | |
| parent | 9b5c0c67f8913bb03e9da1a41046cbe1b86c92a9 (diff) | |
| parent | 87306bebe0b74624bdbaf78a1e2516b75144c007 (diff) | |
Merge "Enable crop to padding for StatusBarIconView" into main
| -rw-r--r-- | packages/SystemUI/aconfig/systemui.aconfig | 10 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 2ad98547a19c..fd2fa07f5e9d 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -338,6 +338,16 @@ flag { } flag { + name: "status_bar_monochrome_icons_fix" + namespace: "systemui" + description: "Fixes the status bar icon size when drawing InsetDrawables (ie. monochrome icons)" + bug: "329091967" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "compose_bouncer" namespace: "systemui" description: "Use the new compose bouncer in SystemUI" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index bb6ee24b0ffe..f8193a4a1b93 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -57,6 +57,7 @@ import com.android.app.animation.Interpolators; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.util.ContrastColorUtil; +import com.android.systemui.Flags; import com.android.systemui.res.R; import com.android.systemui.statusbar.notification.NotificationContentDescription; import com.android.systemui.statusbar.notification.NotificationDozeHelper; @@ -208,6 +209,10 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi initializeDecorColor(); reloadDimens(); maybeUpdateIconScaleDimens(); + + if (Flags.statusBarMonochromeIconsFix()) { + setCropToPadding(true); + } } /** Should always be preceded by {@link #reloadDimens()} */ |