From 4ebc4fb528cc11d9d5f744a815fcef177fe1382a Mon Sep 17 00:00:00 2001 From: Karl Rosaen Date: Tue, 11 Aug 2009 17:57:50 -0700 Subject: If no interpolator is specified for a progress bar in the theme, default to a LinearInterpolator. Fixes bug 2031844. --- core/java/android/widget/ProgressBar.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/java') diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index 2c9e71e..b179a13 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -190,10 +190,12 @@ 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); - } + } setMax(a.getInt(R.styleable.ProgressBar_max, mMax)); -- cgit v1.1