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

Merge "Fixed ProgressBar logic for AnimationDrawables"

Browse Source
This commit is contained in:
Chet Haase
2011-09-29 07:47:16 -07:00
committed by Android (Google) Code Review
parent 29af074436 a79803c092
commit 253f694981
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -937,7 +937,8 @@ public class ProgressBar extends View {
int left = 0; int left = 0;
if (mIndeterminateDrawable != null) { if (mIndeterminateDrawable != null) {
if (mOnlyIndeterminate) { // Aspect ratio logic does not apply to AnimationDrawables
if (mOnlyIndeterminate && !(mIndeterminateDrawable instanceof AnimationDrawable)) {
// Maintain aspect ratio. Certain kinds of animated drawables // Maintain aspect ratio. Certain kinds of animated drawables
// get very confused otherwise. // get very confused otherwise.
final int intrinsicWidth = mIndeterminateDrawable.getIntrinsicWidth(); final int intrinsicWidth = mIndeterminateDrawable.getIntrinsicWidth();