From 9c4226952c74f024c09e0bd381048493993c974e Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Thu, 24 Jul 2014 17:49:08 -0700
Subject: Status labels for video calls.

- Display the appropriate status labels for video calls, mostly
depending on whether one is in a video call, and whether one
has requested video and is waiting for a response, or a video
request has failed.
- Add a handler to the CallCardPresenter, so we can show an error
message in the fail case, but only show the message for a time.
- Add video icon in layout.
- Renamed CallVideoClientNotifier to reflect newer nomenclature.
- Add session modification state information on InCallUI call. This
helps us track state to know what strings to display on the card.

Bug: 16013340
Change-Id: Ib2bf84d93a05664adbf7fe838848b7d7b54a8254
---
 InCallUI/res/layout/primary_call_info.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'InCallUI/res')

diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 474a3aaa9..cc53e05f8 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -44,13 +44,23 @@
         <ImageView android:id="@+id/callStateIcon"
             android:layout_width="16dp"
             android:layout_height="16dp"
-            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
             android:baselineAlignBottom="true"
             android:tint="@color/incall_accent_color"
             android:alpha="0.7"
             android:scaleType="centerInside"
             android:visibility="gone" />
 
+        <ImageView android:id="@+id/videoCallIcon"
+            android:src="@drawable/ic_toolbar_video"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_marginEnd="4dp"
+            android:baselineAlignBottom="true"
+            android:tint="@color/incall_accent_color"
+            android:scaleType="centerInside"
+            android:visibility="gone" />
+
         <TextView android:id="@+id/callStateLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-- 
cgit v1.2.3