summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/src
diff options
context:
space:
mode:
author Evan Laird <evanlaird@google.com> 2025-02-06 18:14:50 -0500
committer Evan Laird <evanlaird@google.com> 2025-02-11 19:01:27 -0500
commitc11a9a338140ab8a42b0d82d05ab29f706b20f01 (patch)
tree6abbd941050f227b5089295f2ec8e4d55385802e /packages/SettingsLib/src
parent2f131f5edaa690dd8f6659a94ac12292d005566b (diff)
[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
Diffstat (limited to 'packages/SettingsLib/src')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java12
1 files changed, 10 insertions, 2 deletions
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() {