diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-04-13 09:16:25 -0700 |
|---|---|---|
| committer | Filip Gruszczynski <gruszczy@google.com> | 2015-04-16 14:39:13 -0700 |
| commit | b6824bf58a0cd34395993fa204217e8e246de6fb (patch) | |
| tree | 764616aa3a6af3b41713629752126e123028983e /core/java/android/widget/TabWidget.java | |
| parent | fb23c67e8a0083ee376ad3f0e98f97d06755eb57 (diff) | |
| download | frameworks_base-b6824bf58a0cd34395993fa204217e8e246de6fb.zip frameworks_base-b6824bf58a0cd34395993fa204217e8e246de6fb.tar.gz frameworks_base-b6824bf58a0cd34395993fa204217e8e246de6fb.tar.bz2 | |
Make UNSPECIFIED measure spec include size hint.
Change-Id: I6c4f193d0590824c644e20e8af16d055a04ac9c9
Diffstat (limited to 'core/java/android/widget/TabWidget.java')
| -rw-r--r-- | core/java/android/widget/TabWidget.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index 9496e62..aa7168c 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -173,11 +173,12 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { } // First, measure with no constraint - final int unspecifiedWidth = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); + final int width = MeasureSpec.getSize(widthMeasureSpec); + final int unspecifiedWidth = MeasureSpec.makeMeasureSpec(width, MeasureSpec.UNSPECIFIED); mImposedTabsHeight = -1; super.measureHorizontal(unspecifiedWidth, heightMeasureSpec); - int extraWidth = getMeasuredWidth() - MeasureSpec.getSize(widthMeasureSpec); + int extraWidth = getMeasuredWidth() - width; if (extraWidth > 0) { final int count = getChildCount(); |