Fix some padding issues related to the top 3 favorites

Also fixed a bug that would cause Index OOB exceptions if
we were to use anything other than 1 row of tiled favorites.

Bug: 10888792
Change-Id: I671032f48fa054847692d28a7c58836bf67c9b29

2 files changed, 4 insertions, 2 deletions

diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index 5f8733d15..1a8b2f31b 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -71,6 +71,7 @@
                 android:fontFamily="sans-serif-light"
                 android:singleLine="true"
                 android:textSize="12sp"
+                android:paddingBottom="2dp"
                 android:fadingEdge="horizontal"
                 android:fadingEdgeLength="3dip"
                 android:ellipsize="marquee"
diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
index 64387fa01..882d3c633 100644
--- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
@@ -452,7 +452,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements
             // Contacts that appear as rows
             // The actual position of the contact in the cursor is simply total the number of
             // tiled contacts + the given position
-            return maxContactsInTiles + position - 1;
+            return maxContactsInTiles + position - mMaxTiledRows;
         }
     }
 
@@ -855,7 +855,8 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements
 
                 // Note MeasuredWidth includes the padding.
                 final int childWidth = child.getMeasuredWidth();
-                child.layout(childLeft, 0, childLeft + childWidth, child.getMeasuredHeight());
+                child.layout(childLeft, getPaddingTop(), childLeft + childWidth,
+                        getPaddingTop() + child.getMeasuredHeight());
                 childLeft += childWidth;
             }
         }