am d9760a8: am 25517fd: am 637c50d: am c7e5a2f: Merge "Fix dividers for LinearLayout (TabWidget)"

Adam Powell · Android Git Automerger · commit 6435da6119ea · 2012-03-01T23:57:10.000-08:00
* commit 'd9760a813e99670c5bdb05c95ae3bafb58abf897':
  Fix dividers for LinearLayout (TabWidget)
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
@@ -309,7 +309,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);
                 }
             }
@@ -336,7 +336,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
`@@ -309,7 +309,7 @@ void drawDividersVertical(Canvas canvas) {`
`309`	`309`	`if (child != null && child.getVisibility() != GONE) {`
`310`	`310`	`if (hasDividerBeforeChildAt(i)) {`
`311`	`311`	`final LayoutParams lp = (LayoutParams) child.getLayoutParams();`
`312`		`- final int top = child.getTop() - lp.topMargin;`
	`312`	`+ final int top = child.getTop() - lp.topMargin - mDividerHeight;`
`313`	`313`	`drawHorizontalDivider(canvas, top);`
`314`	`314`	`}`
`315`	`315`	`}`
`@@ -336,7 +336,7 @@ void drawDividersHorizontal(Canvas canvas) {`
`336`	`336`	`if (child != null && child.getVisibility() != GONE) {`
`337`	`337`	`if (hasDividerBeforeChildAt(i)) {`
`338`	`338`	`final LayoutParams lp = (LayoutParams) child.getLayoutParams();`
`339`		`- final int left = child.getLeft() - lp.leftMargin;`
	`339`	`+ final int left = child.getLeft() - lp.leftMargin - mDividerWidth;`
`340`	`340`	`drawVerticalDivider(canvas, left);`
`341`	`341`	`}`
`342`	`342`	`}`