From 4e24159edc0e68a9c4eed63144dab435e12991f5 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Tue, 18 Mar 2014 12:03:35 -0700
Subject: DO NOT MERGE Swap 9 patch for contact tiles

Tweak contact tile dimensions slightly

Bug: 13526106

Change-Id: I7ae82dc1815c95577c204dd6ed955d0bf1bc0dc3
---
 res/drawable-hdpi/ic_contacts_tiles.9.png              | Bin 0 -> 144 bytes
 res/drawable-mdpi/ic_contacts_tiles.9.png              | Bin 0 -> 138 bytes
 res/drawable-xhdpi/ic_contacts_tiles.9.png             | Bin 0 -> 149 bytes
 res/drawable-xxhdpi/ic_contacts_tiles.9.png            | Bin 0 -> 1047 bytes
 res/layout/phone_favorite_tile_view.xml                |   3 +--
 res/values/dimens.xml                                  |   2 +-
 src/com/android/dialer/list/PhoneFavoriteTileView.java |  10 +++++-----
 7 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_contacts_tiles.9.png
 create mode 100644 res/drawable-mdpi/ic_contacts_tiles.9.png
 create mode 100644 res/drawable-xhdpi/ic_contacts_tiles.9.png
 create mode 100644 res/drawable-xxhdpi/ic_contacts_tiles.9.png

diff --git a/res/drawable-hdpi/ic_contacts_tiles.9.png b/res/drawable-hdpi/ic_contacts_tiles.9.png
new file mode 100644
index 000000000..572fdb890
Binary files /dev/null and b/res/drawable-hdpi/ic_contacts_tiles.9.png differ
diff --git a/res/drawable-mdpi/ic_contacts_tiles.9.png b/res/drawable-mdpi/ic_contacts_tiles.9.png
new file mode 100644
index 000000000..343053a60
Binary files /dev/null and b/res/drawable-mdpi/ic_contacts_tiles.9.png differ
diff --git a/res/drawable-xhdpi/ic_contacts_tiles.9.png b/res/drawable-xhdpi/ic_contacts_tiles.9.png
new file mode 100644
index 000000000..5a5658711
Binary files /dev/null and b/res/drawable-xhdpi/ic_contacts_tiles.9.png differ
diff --git a/res/drawable-xxhdpi/ic_contacts_tiles.9.png b/res/drawable-xxhdpi/ic_contacts_tiles.9.png
new file mode 100644
index 000000000..4e6872d98
Binary files /dev/null and b/res/drawable-xxhdpi/ic_contacts_tiles.9.png differ
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index 54f9de787..952bb2a2a 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:focusable="true"
-        android:background="@drawable/ic_tile_for_recents_and_contact_tile">
+        android:background="@drawable/ic_contacts_tiles">
 
         <com.android.contacts.common.widget.LayoutSuppressingImageView
             android:id="@+id/contact_tile_image"
@@ -72,7 +72,6 @@
                 android:fontFamily="sans-serif"
                 android:singleLine="true"
                 android:textSize="11sp"
-                android:paddingBottom="2dp"
                 android:fadingEdge="horizontal"
                 android:fadingEdgeLength="3dip"
                 android:ellipsize="marquee"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f0e36bc2e..9490d8da5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -74,7 +74,7 @@
     <dimen name="contact_tile_info_button_height_and_width">36dp</dimen>
     <item name="contact_tile_height_to_width_ratio" type="dimen">67%</item>
     <dimen name="contact_tile_text_side_padding">10dp</dimen>
-    <dimen name="contact_tile_text_bottom_padding">9dp</dimen>
+    <dimen name="contact_tile_text_bottom_padding">8dp</dimen>
     <dimen name="favorites_row_top_padding">6dp</dimen>
     <dimen name="favorites_row_bottom_padding">6dp</dimen>
     <dimen name="favorites_row_start_padding">8dp</dimen>
diff --git a/src/com/android/dialer/list/PhoneFavoriteTileView.java b/src/com/android/dialer/list/PhoneFavoriteTileView.java
index 9d36fb2a6..f55d4fcd2 100644
--- a/src/com/android/dialer/list/PhoneFavoriteTileView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteTileView.java
@@ -48,13 +48,13 @@ public abstract class PhoneFavoriteTileView extends ContactTileView {
     private static final String TAG = PhoneFavoriteTileView.class.getSimpleName();
     private static final boolean DEBUG = false;
 
-    // These parameters instruct the photo manager to display the default image/letter at 65% of
-    // its normal size, and vertically offset upwards 17% towards the top of the letter tile, to
+    // These parameters instruct the photo manager to display the default image/letter at 70% of
+    // its normal size, and vertically offset upwards 14% towards the top of the letter tile, to
     // make room for the contact name and number label at the bottom of the image.
-    private static final float DEFAULT_IMAGE_LETTER_OFFSET = -0.17f;
-    private static final float DEFAULT_IMAGE_LETTER_SCALE = 0.65f;
+    private static final float DEFAULT_IMAGE_LETTER_OFFSET = -0.14f;
+    private static final float DEFAULT_IMAGE_LETTER_SCALE = 0.70f;
 
-    /** Length of all animations in miniseconds. */
+    /** Length of all animations in milliseconds. */
     private int mAnimationDuration;
 
     /** The view that holds the front layer of the favorite contact card. */
-- 
cgit v1.2.3