summaryrefslogtreecommitdiff
path: root/core/java/android/widget/StackView.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2010-09-28 14:53:47 -0700
committerAdam Cohen <adamcohen@google.com>2010-10-01 17:18:43 -0700
commit1b065cd1401253f999caa5d0ac12909407cef00e (patch)
tree6d26e9c2477308aa2a08c3f866f4a16d6b000412 /core/java/android/widget/StackView.java
parentefb8a3d6e058c8bc90bb9da6c58dde453f359851 (diff)
Added looping parameter to AdapterViewAnimator / StackView
Change-Id: Iad36f7c0e657ffbae6dd17d0c9464ddf12de8b7b
Diffstat (limited to 'core/java/android/widget/StackView.java')
-rw-r--r--core/java/android/widget/StackView.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/widget/StackView.java b/core/java/android/widget/StackView.java
index 40a5b29e352c..839de7decb6b 100644
--- a/core/java/android/widget/StackView.java
+++ b/core/java/android/widget/StackView.java
@@ -132,7 +132,7 @@ public class StackView extends AdapterViewAnimator {
}
private void initStackView() {
- configureViewAnimator(NUM_ACTIVE_VIEWS, NUM_ACTIVE_VIEWS - 2, false);
+ configureViewAnimator(NUM_ACTIVE_VIEWS, NUM_ACTIVE_VIEWS - 2);
setStaticTransformationsEnabled(true);
final ViewConfiguration configuration = ViewConfiguration.get(getContext());
mTouchSlop = configuration.getScaledTouchSlop();
@@ -287,7 +287,6 @@ public class StackView extends AdapterViewAnimator {
// framework level support for drawing outside of a parent's bounds.
private void disableParentalClipping() {
if (mAncestorContainingAllChildren != null) {
- Log.v(TAG, "Disabling parental clipping.");
ViewGroup vg = this;
while (vg.getParent() != null && vg.getParent() instanceof ViewGroup) {
if (vg == mAncestorContainingAllChildren) break;
@@ -363,7 +362,9 @@ public class StackView extends AdapterViewAnimator {
if (mAdapter == null) return;
- if (mCurrentWindowStartUnbounded + activeIndex == 0) {
+ if (mLoopViews) {
+ mStackSlider.setMode(StackSlider.NORMAL_MODE);
+ } else if (mCurrentWindowStartUnbounded + activeIndex == 0) {
mStackSlider.setMode(StackSlider.BEGINNING_OF_STACK_MODE);
} else if (mCurrentWindowStartUnbounded + activeIndex == mAdapter.getCount()) {
activeIndex--;