From 1970263aad3e26c0e36dbe3783bef5d9f0ff29f0 Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Fri, 25 Jul 2014 13:23:16 -0700
Subject: Add account label to call details if appropriate

We will be adding the account label field to call details if there is
more than one account to disambiguate. Otherwise this field will be
hidden.

Bug: 16488229

Change-Id: Idb03d09d63372655504a5f9178e6f2e408aefb88
---
 res/layout/call_detail.xml                | 15 ++++++++++++++-
 res/layout/call_detail_history_header.xml |  1 +
 res/values/dimens.xml                     |  5 +++--
 3 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index f08531b0c..45431a215 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -35,7 +35,6 @@
             android:paddingBottom="@dimen/call_detail_bottom_margin"
             android:baselineAligned="false"
             android:orientation="horizontal"
-            android:gravity="center_vertical"
             android:translationZ="@dimen/call_detail_translation_z"
             android:focusable="true"
             android:background="@color/background_dialer_white" >
@@ -45,6 +44,8 @@
                 android:layout_width="@dimen/contact_photo_size"
                 android:layout_height="@dimen/contact_photo_size"
                 android:layout_alignParentStart="true"
+                android:layout_gravity="top"
+                android:layout_marginTop="3dp"
                 android:focusable="true"
                 />
 
@@ -61,6 +62,8 @@
                     android:layout_height="wrap_content"
                     android:textColor="?attr/call_log_primary_text_color"
                     android:textSize="@dimen/call_log_primary_text_size"
+                    android:includeFontPadding="false"
+                    android:layout_marginBottom="5dp"
                     android:singleLine="true"
                     />
                 <TextView
@@ -69,8 +72,18 @@
                     android:layout_height="wrap_content"
                     android:textColor="?attr/call_log_secondary_text_color"
                     android:textSize="@dimen/call_log_secondary_text_size"
+                    android:layout_marginBottom="1dp"
                     android:singleLine="true"
                     />
+                <TextView
+                    android:id="@+id/phone_account_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/call_log_secondary_text_color"
+                    android:textSize="@dimen/call_log_secondary_text_size"
+                    android:singleLine="true"
+                    android:visibility="gone"
+                    />
             </LinearLayout>
         </LinearLayout>
 
diff --git a/res/layout/call_detail_history_header.xml b/res/layout/call_detail_history_header.xml
index b4b63fb35..04d406fcf 100644
--- a/res/layout/call_detail_history_header.xml
+++ b/res/layout/call_detail_history_header.xml
@@ -20,6 +20,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/call_detail_header_top_margin"
+    android:paddingBottom="@dimen/call_detail_header_bottom_margin"
     android:paddingStart="@dimen/call_detail_horizontal_margin"
     android:textColor="?attr/call_log_secondary_text_color"
     android:textSize="@dimen/call_log_secondary_text_size"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 176680ee6..267f0dfd4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -25,7 +25,7 @@
     <dimen name="call_log_call_action_size">32dip</dimen>
     <dimen name="call_log_call_action_width">54dp</dimen>
     <dimen name="call_log_icon_margin">4dip</dimen>
-    <dimen name="call_log_inner_margin">8dip</dimen>
+    <dimen name="call_log_inner_margin">13dip</dimen>
     <dimen name="call_log_outer_margin">8dp</dimen>
     <dimen name="call_log_start_margin">16dp</dimen>
     <dimen name="call_log_indent_margin">24dip</dimen>
@@ -38,7 +38,8 @@
     <dimen name="call_detail_horizontal_margin">16dp</dimen>
     <dimen name="call_detail_top_margin">36dp</dimen>
     <dimen name="call_detail_bottom_margin">32dp</dimen>
-    <dimen name="call_detail_header_top_margin">24dp</dimen>
+    <dimen name="call_detail_header_top_margin">20dp</dimen>
+    <dimen name="call_detail_header_bottom_margin">9dp</dimen>
     <dimen name="call_detail_translation_z">0.5dp</dimen>
     <dimen name="transcription_top_margin">18dp</dimen>
     <dimen name="transcription_bottom_margin">18dp</dimen>
-- 
cgit v1.2.3