summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jack Veenstra <veenstra@android.com> 2009-07-29 11:00:10 -0700
committer Jack Veenstra <veenstra@android.com> 2009-07-29 15:19:23 -0700
commit5d5cd178e3afe4a0069d392834cdebcc5c35cc08 (patch)
treedac0f83641fa341cf74a40e0c66f230bf472b75e
parent0869f7ef1efa9fe2e26b20e525952ad611d379aa (diff)
Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
-rw-r--r--core/java/android/widget/TabWidget.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java
index a26bfa23eff8..47f5c6c264da 100644
--- a/core/java/android/widget/TabWidget.java
+++ b/core/java/android/widget/TabWidget.java
@@ -277,7 +277,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
if (child.getLayoutParams() == null) {
final LinearLayout.LayoutParams lp = new LayoutParams(
0,
- ViewGroup.LayoutParams.WRAP_CONTENT, 1);
+ ViewGroup.LayoutParams.FILL_PARENT, 1.0f);
lp.setMargins(0, 0, 0, 0);
child.setLayoutParams(lp);
}
@@ -289,10 +289,10 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
// If we have dividers between the tabs and we already have at least one
// tab, then add a divider before adding the next tab.
if (mDividerDrawable != null && getTabCount() > 0) {
- View divider = new View(mContext);
+ ImageView divider = new ImageView(mContext);
final LinearLayout.LayoutParams lp = new LayoutParams(
mDividerDrawable.getIntrinsicWidth(),
- mDividerDrawable.getIntrinsicHeight());
+ LayoutParams.FILL_PARENT);
lp.setMargins(0, 0, 0, 0);
divider.setLayoutParams(lp);
divider.setBackgroundDrawable(mDividerDrawable);