commit ce61ffedd3c8ebc6325ca5e3832f02cfbed5053f
author Katherine Kuan <katherinekuan@google.com> Wed Oct 26 20:00:47 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 26 20:00:47 2011 -0700
tree f42c8b6d59515094a532ec7f8aa7cf1b4d3b894c
parent 6feb0d3fcae55524e66edc1bad4e97ac936ec197
parent 76df4577358b36dae9c0fdd9afb1b16cc428a265

Merge "Fix "<N> contacts" label in tablet contact list" into ics-mr1

src/com/android/contacts/list/ContactListPinnedHeaderView.java

diff --git a/src/com/android/contacts/list/ContactListPinnedHeaderView.java b/src/com/android/contacts/list/ContactListPinnedHeaderView.java
index 913bb75..aee77e1 100644
--- a/src/com/android/contacts/list/ContactListPinnedHeaderView.java
+++ b/src/com/android/contacts/list/ContactListPinnedHeaderView.java
@@ -113,8 +113,9 @@
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        int width = right - left - mPaddingRight;
+        int width = right - left;
 
+        // Take into account left and right padding when laying out the below views.
         mHeaderTextView.layout(mHeaderTextIndent + mPaddingLeft,
                 0,
                 mHeaderTextView.getMeasuredWidth() + mHeaderTextIndent + mPaddingLeft,
@@ -129,7 +130,7 @@
 
         mHeaderDivider.layout(mPaddingLeft,
                 mHeaderBackgroundHeight,
-                width,
+                width - mPaddingRight,
                 mHeaderBackgroundHeight + mHeaderUnderlineHeight);
     }