summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Cohen <adamcohen@google.com> 2011-01-27 18:05:02 -0800
committer Adam Cohen <adamcohen@google.com> 2011-01-27 18:13:10 -0800
commitc6a4716e24e6310efae78d04d86cc3369c2023b2 (patch)
tree52463b47b96ce23e81356aeed307b9294b75163a
parent64a2c359aeda59e4bc43d48f31ade919e918ea26 (diff)
Fixing static StackView scenario (Issue: 3399844)
Change-Id: Ic1e700f7b4071f6ae86912cf5f12828e3f68f412
-rw-r--r--core/java/android/widget/StackView.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/widget/StackView.java b/core/java/android/widget/StackView.java
index 7a74241e1bdf..6a09d3548e79 100644
--- a/core/java/android/widget/StackView.java
+++ b/core/java/android/widget/StackView.java
@@ -546,12 +546,16 @@ public class StackView extends AdapterViewAnimator {
private void onLayout() {
if (!mFirstLayoutHappened) {
- mSlideAmount = Math.round(SLIDE_UP_RATIO * getMeasuredHeight());
- mSwipeThreshold = Math.round(SWIPE_THRESHOLD_RATIO * mSlideAmount);
mFirstLayoutHappened = true;
updateChildTransforms();
}
+ final int newSlideAmount = Math.round(SLIDE_UP_RATIO * getMeasuredHeight());
+ if (mSlideAmount != newSlideAmount) {
+ mSlideAmount = newSlideAmount;
+ mSwipeThreshold = Math.round(SWIPE_THRESHOLD_RATIO * newSlideAmount);
+ }
+
if (Float.compare(mPerspectiveShiftY, mNewPerspectiveShiftY) != 0 ||
Float.compare(mPerspectiveShiftX, mNewPerspectiveShiftX) != 0) {