Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb

Browse Source 
* commit 'e31ecf61042171242e6f31f22df7691c40f189b2':
  Fixing static StackView scenario (Issue: 3399844)
This commit is contained in:
Adam Cohen
2011-01-27 20:06:09 -08:00
committed by Android Git Automerger
parent fb80d648e2 e31ecf6104
commit aed413a18c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/StackView.java
View File

@@ -546,12 +546,16 @@ public class StackView extends AdapterViewAnimator {
private void onLayout() { private void onLayout() {
if (!mFirstLayoutHappened) { if (!mFirstLayoutHappened) {
mSlideAmount = Math.round(SLIDE_UP_RATIO * getMeasuredHeight());
mSwipeThreshold = Math.round(SWIPE_THRESHOLD_RATIO * mSlideAmount);
mFirstLayoutHappened = true; mFirstLayoutHappened = true;
updateChildTransforms(); 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 || if (Float.compare(mPerspectiveShiftY, mNewPerspectiveShiftY) != 0 ||
Float.compare(mPerspectiveShiftX, mNewPerspectiveShiftX) != 0) { Float.compare(mPerspectiveShiftX, mNewPerspectiveShiftX) != 0) {