diff options
| author | Karl Rosaen <krosaen@google.com> | 2009-08-12 12:36:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-12 12:36:29 -0700 |
| commit | 256f9148fb6389391b13a9c396253aed682010cf (patch) | |
| tree | 7322e889b754df351f497a8946150a1ecd7c2f21 /core/java | |
| parent | 90f77218a24ac66bea52faef79c30d45420ce135 (diff) | |
| parent | 4c85f133e10ceaeb2553adb397d4828a7091e7e6 (diff) | |
| download | frameworks_base-256f9148fb6389391b13a9c396253aed682010cf.zip frameworks_base-256f9148fb6389391b13a9c396253aed682010cf.tar.gz frameworks_base-256f9148fb6389391b13a9c396253aed682010cf.tar.bz2 | |
am 4c85f133: Merge change 20869 into donut
Merge commit '4c85f133e10ceaeb2553adb397d4828a7091e7e6'
* commit '4c85f133e10ceaeb2553adb397d4828a7091e7e6':
If no interpolator is specified for a progress bar in the theme, default to a LinearInterpolator.
Diffstat (limited to 'core/java')
| -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)); |