Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 253f6949 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Fixed ProgressBar logic for AnimationDrawables"

parents 29af0744 a79803c0

core/java/android/widget/ProgressBar.java

+2 −1
Original line number Diff line number Diff line
@@ -937,7 +937,8 @@ public class ProgressBar extends View { 
        int left = 0;



        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

                // get very confused otherwise.

                final int intrinsicWidth = mIndeterminateDrawable.getIntrinsicWidth();