diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-07-25 13:54:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-25 13:54:02 -0700 |
| commit | 84e35d995f0b804a322e9e07fd1a0341658763ef (patch) | |
| tree | f529a767d2baa01e2c69662b2a1e4c311177798d | |
| parent | 496aa6d4d923eb5d6fb270f13172e790aa4d09e0 (diff) | |
| parent | 4725660292bcf11c84e9c7da127fd0215fb58e81 (diff) | |
| download | frameworks_base-84e35d995f0b804a322e9e07fd1a0341658763ef.zip frameworks_base-84e35d995f0b804a322e9e07fd1a0341658763ef.tar.gz frameworks_base-84e35d995f0b804a322e9e07fd1a0341658763ef.tar.bz2 | |
Merge "Fixing old bug with AdapterViewFlipper"
| -rw-r--r-- | core/java/android/widget/AdapterViewFlipper.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/widget/AdapterViewFlipper.java b/core/java/android/widget/AdapterViewFlipper.java index 273c258..4419886 100644 --- a/core/java/android/widget/AdapterViewFlipper.java +++ b/core/java/android/widget/AdapterViewFlipper.java @@ -62,15 +62,14 @@ public class AdapterViewFlipper extends AdapterViewAnimator { super(context, attrs); TypedArray a = context.obtainStyledAttributes(attrs, - com.android.internal.R.styleable.ViewFlipper); + com.android.internal.R.styleable.AdapterViewFlipper); mFlipInterval = a.getInt( - com.android.internal.R.styleable.ViewFlipper_flipInterval, DEFAULT_INTERVAL); + com.android.internal.R.styleable.AdapterViewFlipper_flipInterval, DEFAULT_INTERVAL); mAutoStart = a.getBoolean( - com.android.internal.R.styleable.ViewFlipper_autoStart, false); + com.android.internal.R.styleable.AdapterViewFlipper_autoStart, false); - // By default we want the flipper to loop - mLoopViews = a.getBoolean( - com.android.internal.R.styleable.AdapterViewAnimator_loopViews, true); + // A view flipper should cycle through the views + mLoopViews = true; a.recycle(); } |