Merge changes from topic "mobile-bars" into main

* changes:
  [sb] requestLayout if the number of levels changes
  [sb] new mobile icons

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() {