diff options
| author | Karl Rosaen <krosaen@google.com> | 2009-08-11 17:57:50 -0700 |
|---|---|---|
| committer | Karl Rosaen <krosaen@google.com> | 2009-08-12 08:07:16 -0700 |
| commit | 4ebc4fb528cc11d9d5f744a815fcef177fe1382a (patch) | |
| tree | f50b4afc6cd8e456c9bd21cf290a0525a20b70fc | |
| parent | eccd6fdd0d86b8610b738fc15c707eedc00ec9dc (diff) | |
| download | frameworks_base-4ebc4fb528cc11d9d5f744a815fcef177fe1382a.zip frameworks_base-4ebc4fb528cc11d9d5f744a815fcef177fe1382a.tar.gz frameworks_base-4ebc4fb528cc11d9d5f744a815fcef177fe1382a.tar.bz2 | |
If no interpolator is specified for a progress bar in the theme, default to a LinearInterpolator.
Fixes bug 2031844.
| -rw-r--r-- | core/java/android/widget/ProgressBar.java | 6 |
1 files changed, 4 insertions, 2 deletions
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)); |