[DO NOT MERGE] legacy icon treatment / circle detection
Bug: 37357483 Change-Id: I63049ad61ad259f546fcf5077ded0a5f444e4395
This commit is contained in:
1 parent
46b3a13528
commit
c1cf75716b
7 files changed
+236
-22
No files matched your search
@@ -19,15 +19,17 @@ public class FixedScaleDrawable extends DrawableWrapper {
|
||||
|
||||
// TODO b/33553066 use the constant defined in MaskableIconDrawable
|
||||
private static final float LEGACY_ICON_SCALE = .7f * .6667f;
|
||||
private float mScale;
|
||||
|
||||
public FixedScaleDrawable() {
|
||||
super(new ColorDrawable());
|
||||
mScale = LEGACY_ICON_SCALE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(Canvas canvas) {
|
||||
int saveCount = canvas.save(Canvas.MATRIX_SAVE_FLAG);
|
||||
canvas.scale(LEGACY_ICON_SCALE, LEGACY_ICON_SCALE,
|
||||
canvas.scale(mScale, mScale,
|
||||
getBounds().exactCenterX(), getBounds().exactCenterY());
|
||||
super.draw(canvas);
|
||||
canvas.restoreToCount(saveCount);
|
||||
@@ -38,4 +40,8 @@ public class FixedScaleDrawable extends DrawableWrapper {
|
||||
|
||||
@Override
|
||||
public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme) { }
|
||||
|
||||
public void setScale(float scale) {
|
||||
mScale = scale * LEGACY_ICON_SCALE;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user