diff options
author | Romain Guy <romainguy@android.com> | 2010-02-24 18:55:22 -0800 |
---|---|---|
committer | Romain Guy <romainguy@android.com> | 2010-02-24 18:55:22 -0800 |
commit | 6c5664ac58463fefb580acd0d9b5550b25511f85 (patch) | |
tree | 7ceb8ab2ca12103660ec96316c9d967d9fd86bdd /core | |
parent | 21a20a39aeb083335fabd1d1098a73977131ec3f (diff) | |
download | frameworks_base-6c5664ac58463fefb580acd0d9b5550b25511f85.zip frameworks_base-6c5664ac58463fefb580acd0d9b5550b25511f85.tar.gz frameworks_base-6c5664ac58463fefb580acd0d9b5550b25511f85.tar.bz2 |
Fix tabs.
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/widget/LinearLayout.java | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 9fcb829..4bd3a82 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -658,14 +658,13 @@ public class LinearLayout extends ViewGroup { // Optimization: don't bother measuring children who are going to use // leftover space. These views will get measured again down below if // there is any leftover space. - final int totalLength = mTotalLength; - mTotalLength = Math.max(totalLength, totalLength + lp.leftMargin + lp.rightMargin); + mTotalLength += lp.leftMargin + lp.rightMargin; // Baseline alignment requires to measure widgets to obtain the - // baseline offset (in particular for TextViews). - // The following defeats the optimization mentioned above. - // Allow the child to use as much space as it wants because we - // can shrink things later (and re-measure). + // baseline offset (in particular for TextViews). The following + // defeats the optimization mentioned above. Allow the child to + // use as much space as it wants because we can shrink things + // later (and re-measure). if (baselineAligned) { final int freeSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); child.measure(freeSpec, freeSpec); @@ -695,9 +694,8 @@ public class LinearLayout extends ViewGroup { } final int childWidth = child.getMeasuredWidth(); - final int totalLength = mTotalLength; - mTotalLength = Math.max(totalLength, totalLength + childWidth + lp.leftMargin + - lp.rightMargin + getNextLocationOffset(child)); + mTotalLength += childWidth + lp.leftMargin + lp.rightMargin + + getNextLocationOffset(child); if (useLargestChild) { largestChildWidth = Math.max(childWidth, largestChildWidth); @@ -782,9 +780,8 @@ public class LinearLayout extends ViewGroup { final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) child.getLayoutParams(); - final int totalLength = mTotalLength; - mTotalLength = Math.max(totalLength, totalLength + largestChildWidth + - lp.leftMargin + lp.rightMargin + getNextLocationOffset(child)); + mTotalLength += largestChildWidth + lp.leftMargin + lp.rightMargin + + getNextLocationOffset(child); } } @@ -854,9 +851,8 @@ public class LinearLayout extends ViewGroup { } } - final int totalLength = mTotalLength; - mTotalLength = Math.max(totalLength, totalLength + child.getMeasuredWidth() + - lp.leftMargin + lp.rightMargin + getNextLocationOffset(child)); + mTotalLength += child.getMeasuredWidth() + lp.leftMargin + lp.rightMargin + + getNextLocationOffset(child); boolean matchHeightLocally = heightMode != MeasureSpec.EXACTLY && lp.height == LayoutParams.MATCH_PARENT; |