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

Commit 4c85f133 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 20869 into donut 

* changes:
  If no interpolator is specified for a progress bar in the theme, default to a LinearInterpolator.
parents b8546001 4ebc4fb5

core/java/android/widget/ProgressBar.java

+4 −2
Original line number Diff line number Diff line
@@ -190,7 +190,9 @@ public class ProgressBar extends View { 


        mBehavior = a.getInt(R.styleable.ProgressBar_indeterminateBehavior, mBehavior);



        final int resID = a.getResourceId(com.android.internal.R.styleable.ProgressBar_interpolator, -1);

        final int resID = a.getResourceId(

                com.android.internal.R.styleable.ProgressBar_interpolator, 

                android.R.anim.linear_interpolator); // default to linear interpolator

        if (resID > 0) {

            setInterpolator(context, resID);

        }