commit b5189b3230ded26c44186505b1a9222df322a57e
author Andrew Lee <anwlee@google.com> Fri May 30 14:41:27 2014 -0700
committer Andrew Lee <anwlee@google.com> Fri May 30 14:42:47 2014 -0700
tree 21472f61d616740fefbad14df279c18a13becbd9
parent a636ada9b053f1baad6c5267b4afb80360418290

Update margins/paddings on the shortcut card.

Bug: 15345202
Change-Id: Iae7143ab84519cf4a04ed9c1f555e5bcd8716516

res/values/dimens.xml

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index adf0fda..ab29523 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -64,13 +64,15 @@
 
     <!-- Dimensions for most recent call shortcut cards -->
     <dimen name="recent_call_log_item_translation_z">4dp</dimen>
-    <dimen name="recent_call_log_item_margin">8dp</dimen>
+    <dimen name="recent_call_log_item_margin_horizontal">8dp</dimen>
+    <dimen name="recent_call_log_item_margin_top">4dp</dimen>
     <dimen name="recent_call_log_item_margin_bottom">6dp</dimen>
 
     <!-- The maximum amount to clip on the left and right of the recent call shortcut card -->
     <dimen name="recent_call_log_item_horizontal_clip_limit">20dp</dimen>
     <dimen name="recent_call_log_item_padding_start">8dp</dimen>
-    <dimen name="recent_call_log_item_padding_bottom">7dp</dimen>
+    <dimen name="recent_call_log_item_padding_top">12dp</dimen>
+    <dimen name="recent_call_log_item_padding_bottom">11dp</dimen>
 
     <!-- Size of the star icon on the favorites tile. -->
     <dimen name="favorites_star_icon_size">12dp</dimen>

src/com/android/dialer/list/ShortcutCardsAdapter.java

diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java
index a39bed5..2ce7ea4 100644
--- a/src/com/android/dialer/list/ShortcutCardsAdapter.java
+++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java
@@ -55,9 +55,11 @@
 
     private final ListsFragment mFragment;
 
-    private final int mCallLogMargin;
+    private final int mCallLogMarginHorizontal;
+    private final int mCallLogMarginTop;
     private final int mCallLogMarginBottom;
     private final int mCallLogPaddingStart;
+    private final int mCallLogPaddingTop;
     private final int mCallLogPaddingBottom;
     private final int mCardMaxHorizontalClip;
 
@@ -106,13 +108,18 @@
         final Resources resources = context.getResources();
         mContext = context;
         mFragment = fragment;
-        mCardMaxHorizontalClip = resources.getDimensionPixelSize(
-                R.dimen.recent_call_log_item_horizontal_clip_limit);
-        mCallLogMargin = resources.getDimensionPixelSize(R.dimen.recent_call_log_item_margin);
+        mCardMaxHorizontalClip =
+                resources.getDimensionPixelSize(R.dimen.recent_call_log_item_horizontal_clip_limit);
+        mCallLogMarginHorizontal =
+                resources.getDimensionPixelSize(R.dimen.recent_call_log_item_margin_horizontal);
+        mCallLogMarginTop =
+                resources.getDimensionPixelSize(R.dimen.recent_call_log_item_margin_top);
         mCallLogMarginBottom =
                 resources.getDimensionPixelSize(R.dimen.recent_call_log_item_margin_bottom);
         mCallLogPaddingStart =
                 resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding_start);
+        mCallLogPaddingTop =
+                resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding_top);
         mCallLogPaddingBottom =
                 resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding_bottom);
 
@@ -222,14 +229,20 @@
             final FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
                     FrameLayout.LayoutParams.MATCH_PARENT,
                     FrameLayout.LayoutParams.WRAP_CONTENT);
-            params.setMargins(mCallLogMargin, mCallLogMargin, mCallLogMargin, mCallLogMarginBottom);
+            params.setMargins(
+                    mCallLogMarginHorizontal,
+                    mCallLogMarginTop,
+                    mCallLogMarginHorizontal,
+                    mCallLogMarginBottom);
             view.setLayoutParams(params);
 
             LinearLayout actionView =
                     (LinearLayout)view.findViewById(R.id.primary_action_view);
             actionView.setPaddingRelative(
-                    mCallLogPaddingStart, actionView.getPaddingTop(),
-                    actionView.getPaddingEnd(), mCallLogPaddingBottom);
+                    mCallLogPaddingStart,
+                    mCallLogPaddingTop,
+                    actionView.getPaddingEnd(),
+                    mCallLogPaddingBottom);
 
             view.setTranslationZ(getResources().getDimensionPixelSize(
                     R.dimen.recent_call_log_item_translation_z));