summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-07-24 17:49:08 -0700
committerAndrew Lee <anwlee@google.com>2014-07-31 11:16:30 -0700
commitaed98fccfc2af12f8c24f93242fecdab23758c8d (patch)
tree9691fac5db87040efbb79310080d39b5a4935637 /res
parentbc8f0c99b16449249e6c1d6405ba89657064ba6b (diff)
downloadpackages_apps_InCallUI-aed98fccfc2af12f8c24f93242fecdab23758c8d.tar.gz
packages_apps_InCallUI-aed98fccfc2af12f8c24f93242fecdab23758c8d.tar.bz2
packages_apps_InCallUI-aed98fccfc2af12f8c24f93242fecdab23758c8d.zip
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
Diffstat (limited to 'res')
-rw-r--r--res/layout/primary_call_info.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
index 474a3aaa..cc53e05f 100644
--- a/res/layout/primary_call_info.xml
+++ b/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"