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

* commit '637c50db476d9a6cec13551920f7c163fef02ab8':
  Fix dividers for LinearLayout (TabWidget)

Author: Adam Powell

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);
                 }
             }