Adjusting size of line item background and divider

Change-Id: I70d4eb72e5a841f825e2d683611a7e3fe319a150
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 31f7876..32247b0 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -15,12 +15,12 @@
 -->
 <resources>
     <style name="ContactBrowserTheme" parent="@android:Theme.Light.Holo">
-        <item name="list_item_height">?android:attr/listPreferredItemHeight</item>
+        <item name="list_item_height">66dip</item>
         <item name="activated_background">@drawable/list_item_activated_background</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:actionBarStyle">@style/TransparentActionBarStyle</item>
         <item name="section_header_background">@drawable/section_header_holo</item>
-        <item name="list_item_divider">@drawable/list_item_divider_holo</item>
+        <item name="list_item_divider">?android:attr/listDivider</item>
         <item name="list_item_padding_top">0dip</item>
         <item name="list_item_padding_right">24dip</item>
         <item name="list_item_padding_bottom">0dip</item>
@@ -39,9 +39,9 @@
     </style>
 
     <style name="ContactPickerTheme" parent="@android:Theme.Holo.Light.Dialog">
-        <item name="list_item_height">?android:attr/listPreferredItemHeight</item>
+        <item name="list_item_height">66dip</item>
         <item name="section_header_background">@drawable/section_header_holo</item>
-        <item name="list_item_divider">@drawable/list_item_divider_holo</item>
+        <item name="list_item_divider">?android:attr/listDivider</item>
         <item name="list_item_padding_top">0dip</item>
         <item name="list_item_padding_right">24dip</item>
         <item name="list_item_padding_bottom">0dip</item>
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index 1294699..692504c 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -226,6 +226,7 @@
         // height is no less than listPreferredItemHeight.
         int width = resolveSize(0, widthMeasureSpec);
         int height = 0;
+        int preferredHeight = mPreferredHeight;
 
         mLine1Height = 0;
         mLine2Height = 0;
@@ -274,9 +275,10 @@
 
         if (mHorizontalDividerVisible) {
             height += mHorizontalDividerHeight;
+            preferredHeight += mHorizontalDividerHeight;
         }
 
-        height = Math.max(height, mPreferredHeight);
+        height = Math.max(height, preferredHeight);
 
         if (mHeaderVisible) {
             mHeaderTextView.measure(