Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix advanced icon will incorrect when change display size" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-09 09:21:19 +00:00
committed by Android (Google) Code Review
parent 5b12e07b9c 280d945d00
commit 7e751a0894
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SettingsLib/AdaptiveIcon/src/com/android/settingslib/widget/AdaptiveOutlineDrawable.java
View File

@@ -29,7 +29,12 @@ import android.graphics.Path;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.AdaptiveIconDrawable; import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.DrawableWrapper; import android.graphics.drawable.DrawableWrapper;
import android.os.RemoteException;
import android.util.DisplayMetrics;
import android.util.PathParser; import android.util.PathParser;
import android.view.Display;
import android.view.IWindowManager;
import android.view.WindowManagerGlobal;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -56,6 +61,7 @@ public class AdaptiveOutlineDrawable extends DrawableWrapper {
private int mStrokeWidth; private int mStrokeWidth;
private Bitmap mBitmap; private Bitmap mBitmap;
private int mType; private int mType;
private float mDensity;
public AdaptiveOutlineDrawable(Resources resources, Bitmap bitmap) { public AdaptiveOutlineDrawable(Resources resources, Bitmap bitmap) {
super(new AdaptiveIconShapeDrawable(resources)); super(new AdaptiveIconShapeDrawable(resources));
@@ -77,6 +83,7 @@ public class AdaptiveOutlineDrawable extends DrawableWrapper {
mPath = new Path(PathParser.createPathFromPathData( mPath = new Path(PathParser.createPathFromPathData(
resources.getString(com.android.internal.R.string.config_icon_mask))); resources.getString(com.android.internal.R.string.config_icon_mask)));
mStrokeWidth = resources.getDimensionPixelSize(R.dimen.adaptive_outline_stroke); mStrokeWidth = resources.getDimensionPixelSize(R.dimen.adaptive_outline_stroke);
mDensity = resources.getDisplayMetrics().density;
mOutlinePaint = new Paint(); mOutlinePaint = new Paint();
mOutlinePaint.setColor(getColor(resources, type)); mOutlinePaint.setColor(getColor(resources, type));
mOutlinePaint.setStyle(Paint.Style.STROKE); mOutlinePaint.setStyle(Paint.Style.STROKE);
@@ -130,7 +137,12 @@ public class AdaptiveOutlineDrawable extends DrawableWrapper {
if (mType == TYPE_DEFAULT) { if (mType == TYPE_DEFAULT) {
canvas.drawPath(mPath, mOutlinePaint); canvas.drawPath(mPath, mOutlinePaint);
} else { } else {
canvas.drawCircle(2 * mInsetPx, 2 * mInsetPx, 2 * mInsetPx - mStrokeWidth, final float defaultDensity = getDefaultDisplayDensity(Display.DEFAULT_DISPLAY)
/ (float) DisplayMetrics.DENSITY_DEFAULT;
final int insetPx =
Math.round(mInsetPx / (float) (Math.floor(
(mDensity / defaultDensity) * 100) / 100.0));
canvas.drawCircle(2 * insetPx, 2 * insetPx, 2 * insetPx - mStrokeWidth,
mOutlinePaint); mOutlinePaint);
} }
canvas.restoreToCount(count); canvas.restoreToCount(count);
@@ -139,6 +151,15 @@ public class AdaptiveOutlineDrawable extends DrawableWrapper {
canvas.drawBitmap(mBitmap, bounds.left + mInsetPx, bounds.top + mInsetPx, null); canvas.drawBitmap(mBitmap, bounds.left + mInsetPx, bounds.top + mInsetPx, null);
} }
private static int getDefaultDisplayDensity(int displayId) {
try {
final IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
return wm.getInitialDisplayDensity(displayId);
} catch (RemoteException exc) {
return -1;
}
}
@Override @Override
public int getIntrinsicHeight() { public int getIntrinsicHeight() {
return mBitmap.getHeight() + 2 * mInsetPx; return mBitmap.getHeight() + 2 * mInsetPx;