PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev

Browse Source
This commit is contained in:
Svetoslav
2013-04-25 20:32:46 +00:00
committed by Android (Google) Code Review
parent f6d483e6c9 8397ba603c
commit 410e2df458
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/users/CircleFramedDrawable.java
View File

@@ -123,12 +123,10 @@ class CircleFramedDrawable extends Drawable {
@Override @Override
public void draw(Canvas canvas) { public void draw(Canvas canvas) {
// clear background final float inside = mScale * mSize;
final float outside = Math.min(canvas.getWidth(), canvas.getHeight()); final float pad = (mSize - inside) / 2f;
final float inside = mScale * outside;
final float pad = (outside - inside) / 2f;
mDstRect.set(pad, pad, outside - pad, outside - pad); mDstRect.set(pad, pad, mSize - pad, mSize - pad);
canvas.drawBitmap(mBitmap, mSrcRect, mDstRect, null); canvas.drawBitmap(mBitmap, mSrcRect, mDstRect, null);
mFrameRect.set(mDstRect); mFrameRect.set(mDstRect);