commit 4b943553afdb7286b33e4bc2481431e816c57967
author Paul Soulos <psoulos@google.com> Wed Jul 23 14:49:52 2014 -0700
committer Paul Soulos <psoulos@google.com> Wed Jul 23 23:09:17 2014 +0000
tree 068069c1d771189dde2a8ff5ad5faf228105e338
parent 891bd2bad8de331a089466777cd054674261a969

Fixes some entry layouts

Moves text over to match up with "See all"/"See less" and adds top margin when only header text is visible.

Bug: 16326938
Change-Id: Ib9171ba8c27ffccfc5eb3c1e023e827e8e71e7fe

res/values/dimens.xml

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d86d9d7..7c6b635 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -171,7 +171,7 @@
     <dimen name="expanding_entry_card_item_padding_end">20dp</dimen>
     <dimen name="expanding_entry_card_item_padding_top">16dp</dimen>
     <dimen name="expanding_entry_card_item_padding_bottom">16dp</dimen>
-    <dimen name="expanding_entry_card_item_image_spacing">16dp</dimen>
+    <dimen name="expanding_entry_card_item_image_spacing">20dp</dimen>
 
     <!-- Dimensions for a button in ExpandingEntryCardView -->
     <dimen name="expanding_entry_card_button_padding_start">20dp</dimen>

src/com/android/contacts/quickcontact/ExpandingEntryCardView.java

diff --git a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
index e4770d8..a0bed05 100644
--- a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
+++ b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
@@ -37,6 +37,7 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.android.contacts.R;
@@ -508,6 +509,16 @@
             view.setTag(entry.getIntent());
         }
 
+        // If only the header is visible, add a top margin to match icon's top margin
+        if (header.getVisibility() == View.VISIBLE && subHeader.getVisibility() == View.GONE &&
+                text.getVisibility() == View.GONE) {
+            RelativeLayout.LayoutParams headerLayoutParams =
+                    (RelativeLayout.LayoutParams) header.getLayoutParams();
+            headerLayoutParams.topMargin = (int) (getResources().getDimension(
+                    R.dimen.expanding_entry_card_item_icon_margin_top));
+            header.setLayoutParams(headerLayoutParams);
+        }
+
         final ImageView alternateIcon = (ImageView) view.findViewById(R.id.icon_alternate);
         if (entry.getAlternateIcon() != null && entry.getAlternateIntent() != null) {
             alternateIcon.setImageDrawable(entry.getAlternateIcon());