diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 6d40216adb436..db43b5b31e7ed 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4408,14 +4408,14 @@ M9,10l-2,0l0,-2l-2,0l0,2l-2,0l0,2l2,0l0,2l2,0l0,-2l2,0z - - - M22,16.41L20.59,15l-2.09,2.09L16.41,15L15,16.41l2.09,2.09L15,20.59L16.41,22l2.09-2.08L20.59,22L22,20.59l-2.08-2.09 L22,16.41z + + + M20,10h2v8h-2z M20,20h2v2h-2z - 11 - 11 + should be cut out to display config_signalAttributionPath. --> + 7 + 17 diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 40555fdaaa452..adb046e76c889 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3369,7 +3369,7 @@ - + diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java b/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java index 3b41fa99d6c49..4d0804e1bbb78 100644 --- a/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java +++ b/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java @@ -72,9 +72,9 @@ public class SignalDrawable extends DrawableWrapper { private final int mLightModeFillColor; private final Path mCutoutPath = new Path(); private final Path mForegroundPath = new Path(); - private final Path mXPath = new Path(); - private final Matrix mXScaleMatrix = new Matrix(); - private final Path mScaledXPath = new Path(); + private final Path mAttributionPath = new Path(); + private final Matrix mAttributionScaleMatrix = new Matrix(); + private final Path mScaledAttributionPath = new Path(); private final Handler mHandler; private final float mCutoutWidthFraction; private final float mCutoutHeightFraction; @@ -85,10 +85,10 @@ public class SignalDrawable extends DrawableWrapper { public SignalDrawable(Context context) { super(context.getDrawable(com.android.internal.R.drawable.ic_signal_cellular)); - final String xPathString = context.getString( - com.android.internal.R.string.config_signalXPath); - mXPath.set(PathParser.createPathFromPathData(xPathString)); - updateScaledXPath(); + final String attributionPathString = context.getString( + com.android.internal.R.string.config_signalAttributionPath); + mAttributionPath.set(PathParser.createPathFromPathData(attributionPathString)); + updateScaledAttributionPath(); mCutoutWidthFraction = context.getResources().getFloat( com.android.internal.R.dimen.config_signalCutoutWidthFraction); mCutoutHeightFraction = context.getResources().getFloat( @@ -104,13 +104,14 @@ public class SignalDrawable extends DrawableWrapper { setDarkIntensity(0); } - private void updateScaledXPath() { + private void updateScaledAttributionPath() { if (getBounds().isEmpty()) { - mXScaleMatrix.setScale(1f, 1f); + mAttributionScaleMatrix.setScale(1f, 1f); } else { - mXScaleMatrix.setScale(getBounds().width() / VIEWPORT, getBounds().height() / VIEWPORT); + mAttributionScaleMatrix.setScale( + getBounds().width() / VIEWPORT, getBounds().height() / VIEWPORT); } - mXPath.transform(mXScaleMatrix, mScaledXPath); + mAttributionPath.transform(mAttributionScaleMatrix, mScaledAttributionPath); } @Override @@ -177,7 +178,7 @@ public class SignalDrawable extends DrawableWrapper { @Override protected void onBoundsChange(Rect bounds) { super.onBoundsChange(bounds); - updateScaledXPath(); + updateScaledAttributionPath(); invalidateSelf(); } @@ -221,7 +222,7 @@ public class SignalDrawable extends DrawableWrapper { mCutoutPath.rLineTo(cutX, 0); mCutoutPath.rLineTo(0, cutY); canvas.drawPath(mCutoutPath, mTransparentPaint); - canvas.drawPath(mScaledXPath, mForegroundPaint); + canvas.drawPath(mScaledAttributionPath, mForegroundPaint); } if (isRtl) { canvas.restore();