From c11a9a338140ab8a42b0d82d05ab29f706b20f01 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Thu, 6 Feb 2025 18:14:50 -0500 Subject: [sb] new mobile icons This replaces the old-new icons. The target size is 12sp height. This CL also flags off the intrinsic size that SignalDrawable was doing. Since that class is now a `DrawableWrapper`, it doesn't need to do this overriding anymore and can defer to its wrapped icons. Test: atest SystemUITests Test: SystemIconsScreenshotTest Flag: com.android.settingslib.flags.new_status_bar_icons Bug: 391606042 Change-Id: I9bd732f12855d734c9d587252ef6e0cd0f8cb9e6 --- .../src/com/android/settingslib/graph/SignalDrawable.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'packages/SettingsLib/src') diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java b/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java index 13a06017abbc..671dfa230f0d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java +++ b/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java @@ -128,12 +128,20 @@ public class SignalDrawable extends DrawableWrapper { @Override public int getIntrinsicWidth() { - return mIntrinsicSize; + if (newStatusBarIcons()) { + return super.getIntrinsicWidth(); + } else { + return mIntrinsicSize; + } } @Override public int getIntrinsicHeight() { - return mIntrinsicSize; + if (newStatusBarIcons()) { + return super.getIntrinsicHeight(); + } else { + return mIntrinsicSize; + } } private void updateAnimation() { -- cgit v1.2.3-59-g8ed1b