Commit baea244a authored Dec 20, 2011 by Chet Haase

Fix ViewAnimator.getDisplayedChild() bug

Adding a view above the currently displayed child in a ViewAnimator
will cause the displayed child index to become stale, because it is
not incremented to reflect the new position of the currently displayed
view. This fix adds logic to the addView() override to increment the
index correctly.

Change-Id: I9c756ce51a8e8dcbeef8f0e4fbb3704482c21e9d

parent 01583ef7

core/java/android/widget/ViewAnimator.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,10 @@ public class ViewAnimator extends FrameLayout {
		} else {
		child.setVisibility(View.GONE);
		}
		if (index >= 0 && mWhichChild >= index) {
		// Added item above current one, increment the index of the displayed child
		setDisplayedChild(mWhichChild + 1);
		}
		}

		@Override