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

Merge "Fix bug 5231904 - Fix wobbly progress spinners"

Browse Source
This commit is contained in:
Adam Powell
2011-09-02 16:48:54 -07:00
committed by Android (Google) Code Review
parent 32041c1602 a1b92c5e8b
commit d857837df2
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/widget/ProgressBar.java
View File

@@ -933,9 +933,32 @@ public class ProgressBar extends View {
// onDraw will translate the canvas so we draw starting at 0,0
int right = w - mPaddingRight - mPaddingLeft;
int bottom = h - mPaddingBottom - mPaddingTop;
int top = 0;
int left = 0;
if (mIndeterminateDrawable != null) {
mIndeterminateDrawable.setBounds(0, 0, right, bottom);
if (mOnlyIndeterminate) {
// Maintain aspect ratio. Certain kinds of animated drawables
// get very confused otherwise.
final int intrinsicWidth = mIndeterminateDrawable.getIntrinsicWidth();
final int intrinsicHeight = mIndeterminateDrawable.getIntrinsicHeight();
final float intrinsicAspect = (float) intrinsicWidth / intrinsicHeight;
final float boundAspect = (float) w / h;
if (intrinsicAspect != boundAspect) {
if (boundAspect > intrinsicAspect) {
// New width is larger. Make it smaller to match height.
final int width = (int) (h * intrinsicAspect);
left = (w - width) / 2;
right = left + width;
} else {
// New height is larger. Make it smaller to match width.
final int height = (int) (w * (1 / intrinsicAspect));
top = (h - height) / 2;
bottom = top + height;
}
}
}
mIndeterminateDrawable.setBounds(left, top, right, bottom);
}
if (mProgressDrawable != null) {

2
graphics/java/android/graphics/drawable/RotateDrawable.java
View File

@@ -83,7 +83,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback {
float px = st.mPivotXRel ? (w * st.mPivotX) : st.mPivotX;
float py = st.mPivotYRel ? (h * st.mPivotY) : st.mPivotY;
canvas.rotate(st.mCurrentDegrees, px, py);
canvas.rotate(st.mCurrentDegrees, px + bounds.left, py + bounds.top);
st.mDrawable.draw(canvas);