diff options
| author | Adam Powell <adamp@android.com> | 2012-03-01 23:57:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-01 23:57:10 -0800 |
| commit | 6435da6119ea6f81d78c3d58f1941e8dd8f8d44d (patch) | |
| tree | 22daade7d111437a74638ae4c9f3e953089b14fb /core/java/android/widget/LinearLayout.java | |
| parent | 7e5f1e8dc03f163274be1e1bb97f4b05dcc0a510 (diff) | |
| parent | d9760a813e99670c5bdb05c95ae3bafb58abf897 (diff) | |
am d9760a81: am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit 'd9760a813e99670c5bdb05c95ae3bafb58abf897':
Fix dividers for LinearLayout (TabWidget)
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index b5deec773f2d..a1bea43c735b 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -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); } } |