Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6435da61 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am d9760a81: am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for... 

am d9760a81: am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"

* commit 'd9760a81':
  Fix dividers for LinearLayout (TabWidget)
parents 7e5f1e8d d9760a81

core/java/android/widget/LinearLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ public class LinearLayout extends ViewGroup { 
            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 @@ public class LinearLayout extends ViewGroup { 
            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);

                }

            }