Merge "Fix dividers for LinearLayout (TabWidget)"

Adam Powell · android code review · commit c7e5a2fe3042 · 2012-03-01T16:26:04.000-08:00
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
@@ -307,7 +307,7 @@ void drawDividersVertical(Canvas canvas) {
             if (child != null && child.getVisibility() != GONE) {
                 if (hasDividerBeforeChildAt(i)) {
                     final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-                    final int top = child.getTop() - lp.topMargin;
+                    final int top = child.getTop() - lp.topMargin - mDividerHeight;
                     drawHorizontalDivider(canvas, top);
                 }
             }
@@ -334,7 +334,7 @@ void drawDividersHorizontal(Canvas canvas) {
             if (child != null && child.getVisibility() != GONE) {
                 if (hasDividerBeforeChildAt(i)) {
                     final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-                    final int left = child.getLeft() - lp.leftMargin;
+                    final int left = child.getLeft() - lp.leftMargin - mDividerWidth;
                     drawVerticalDivider(canvas, left);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ void drawDividersVertical(Canvas canvas) {`
`307`	`307`	`if (child != null && child.getVisibility() != GONE) {`
`308`	`308`	`if (hasDividerBeforeChildAt(i)) {`
`309`	`309`	`final LayoutParams lp = (LayoutParams) child.getLayoutParams();`
`310`		`- final int top = child.getTop() - lp.topMargin;`
	`310`	`+ final int top = child.getTop() - lp.topMargin - mDividerHeight;`
`311`	`311`	`drawHorizontalDivider(canvas, top);`
`312`	`312`	`}`
`313`	`313`	`}`
`@@ -334,7 +334,7 @@ void drawDividersHorizontal(Canvas canvas) {`
`334`	`334`	`if (child != null && child.getVisibility() != GONE) {`
`335`	`335`	`if (hasDividerBeforeChildAt(i)) {`
`336`	`336`	`final LayoutParams lp = (LayoutParams) child.getLayoutParams();`
`337`		`- final int left = child.getLeft() - lp.leftMargin;`
	`337`	`+ final int left = child.getLeft() - lp.leftMargin - mDividerWidth;`
`338`	`338`	`drawVerticalDivider(canvas, left);`
`339`	`339`	`}`
`340`	`340`	`}`