From c6a4716e24e6310efae78d04d86cc3369c2023b2 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 27 Jan 2011 18:05:02 -0800
Subject: Fixing static StackView scenario (Issue: 3399844)

Change-Id: Ic1e700f7b4071f6ae86912cf5f12828e3f68f412
---
 core/java/android/widget/StackView.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'core/java/android/widget/StackView.java')

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) {
 
-- 
cgit v1.2.3