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

Merge change 9035 into donut

Browse Source 
* changes:
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
This commit is contained in:
Android (Google) Code Review
2009-07-29 15:27:55 -07:00
parent 3d716ed6a3 5d5cd178e3
commit 0067057c31
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/TabWidget.java
View File

@@ -277,7 +277,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
if (child.getLayoutParams() == null) { if (child.getLayoutParams() == null) {
final LinearLayout.LayoutParams lp = new LayoutParams( final LinearLayout.LayoutParams lp = new LayoutParams(
0, 0,
ViewGroup.LayoutParams.WRAP_CONTENT, 1); ViewGroup.LayoutParams.FILL_PARENT, 1.0f);
lp.setMargins(0, 0, 0, 0); lp.setMargins(0, 0, 0, 0);
child.setLayoutParams(lp); 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 // If we have dividers between the tabs and we already have at least one
// tab, then add a divider before adding the next tab. // tab, then add a divider before adding the next tab.
if (mDividerDrawable != null && getTabCount() > 0) { if (mDividerDrawable != null && getTabCount() > 0) {
View divider = new View(mContext); ImageView divider = new ImageView(mContext);
final LinearLayout.LayoutParams lp = new LayoutParams( final LinearLayout.LayoutParams lp = new LayoutParams(
mDividerDrawable.getIntrinsicWidth(), mDividerDrawable.getIntrinsicWidth(),
mDividerDrawable.getIntrinsicHeight()); LayoutParams.FILL_PARENT);
lp.setMargins(0, 0, 0, 0); lp.setMargins(0, 0, 0, 0);
divider.setLayoutParams(lp); divider.setLayoutParams(lp);
divider.setBackgroundDrawable(mDividerDrawable); divider.setBackgroundDrawable(mDividerDrawable);