Merge "Fix dividers for LinearLayout (TabWidget)"

williamsheet · Mar 2, 2012 · c7e5a2f · c7e5a2f
2 parents 5aeb858 + 20761fc
commit c7e5a2f
Showing 1 changed file with 2 additions and 2 deletions.
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);
                 }
             }