diff options
| author | Andrew Lee <anwlee@google.com> | 2014-07-24 17:49:08 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-07-31 11:16:30 -0700 |
| commit | 9c4226952c74f024c09e0bd381048493993c974e (patch) | |
| tree | 4ae9e13c84cba7f33ebae1bf5087a7b332870699 /InCallUI/res | |
| parent | 49e24bf10151b64a55cc8d5d4727e27b752e07bc (diff) | |
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 'InCallUI/res')
| -rw-r--r-- | InCallUI/res/layout/primary_call_info.xml | 12 |
1 files changed, 11 insertions, 1 deletions
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" |