OSDN Git Service

Fix the TabWidget to display custom views for the tabs better when the tabs have...
authorJack Veenstra <veenstra@android.com>
Wed, 29 Jul 2009 18:00:10 +0000 (11:00 -0700)
committerJack Veenstra <veenstra@android.com>
Wed, 29 Jul 2009 22:19:23 +0000 (15:19 -0700)
core/java/android/widget/TabWidget.java

index a26bfa2..47f5c6c 100644 (file)
@@ -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);