From dc3122e9d7bc0c6f5fef00bed36bb300c40afadf Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Wed, 15 Apr 2015 02:04:51 -0700
Subject: Show IMS Conference StatusHints in InCall.

A lot of this logic for figuring out what label should be shown seems
like it should be determined in the presenter, rather than passing
through all this information to the fragment, but it can be cleaned up
at another time.

+ minor layout tweak.

Bug: 20181703
Change-Id: I392ce7cffc8c05eb94859892e899ce7c693895aa
---
 InCallUI/res/layout/primary_call_info.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'InCallUI/res/layout/primary_call_info.xml')

diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 8f0c0e24d..207b95bef 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -44,7 +44,8 @@
         <ImageView android:id="@+id/callStateIcon"
             android:layout_width="16dp"
             android:layout_height="match_parent"
-            android:layout_marginEnd="8dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginEnd="10dp"
             android:tint="@color/incall_accent_color"
             android:alpha="0.0"
             android:scaleType="center"
-- 
cgit v1.2.3