drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev

Browse Source
This commit is contained in:
Jim Miller
2012-06-19 18:31:31 -07:00
committed by Android (Google) Code Review
parent 0e302bc884 94754ef36d
commit fce2ec4da4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/widget/multiwaveview/PointCloud.java
View File

@ -202,25 +202,25 @@ public class PointCloud {
public void draw(Canvas canvas) { public void draw(Canvas canvas) {
ArrayList<Point> points = mPointCloud; ArrayList<Point> points = mPointCloud;
final float cx = mDrawable != null ? (-mDrawable.getIntrinsicWidth() / 2) : 0;
final float cy = mDrawable != null ? (-mDrawable.getIntrinsicHeight() / 2) : 0;
canvas.save(Canvas.MATRIX_SAVE_FLAG); canvas.save(Canvas.MATRIX_SAVE_FLAG);
canvas.scale(mScale, mScale, mCenterX, mCenterY); canvas.scale(mScale, mScale, mCenterX, mCenterY);
for (int i = 0; i < points.size(); i++) { for (int i = 0; i < points.size(); i++) {
Point point = points.get(i); Point point = points.get(i);
final float pointSize = interp(MAX_POINT_SIZE, MIN_POINT_SIZE, final float pointSize = interp(MAX_POINT_SIZE, MIN_POINT_SIZE,
point.radius / mOuterRadius); point.radius / mOuterRadius);
final float px = point.x + cx + mCenterX; final float px = point.x + mCenterX;
final float py = point.y + cy + mCenterY; final float py = point.y + mCenterY;
int alpha = getAlphaForPoint(point); int alpha = getAlphaForPoint(point);
if (alpha == 0) continue; if (alpha == 0) continue;
if (mDrawable != null) { if (mDrawable != null) {
canvas.save(Canvas.MATRIX_SAVE_FLAG); canvas.save(Canvas.MATRIX_SAVE_FLAG);
float s = pointSize / MAX_POINT_SIZE; final float cx = mDrawable.getIntrinsicWidth() * 0.5f;
final float cy = mDrawable.getIntrinsicHeight() * 0.5f;
final float s = pointSize / MAX_POINT_SIZE;
canvas.scale(s, s, px, py); canvas.scale(s, s, px, py);
canvas.translate(px, py); canvas.translate(px - cx, py - cy);
mDrawable.setAlpha(alpha); mDrawable.setAlpha(alpha);
mDrawable.draw(canvas); mDrawable.draw(canvas);
canvas.restore(); canvas.restore();