summaryrefslogtreecommitdiff
path: root/InCallUI/res/layout/caller_in_conference.xml
diff options
context:
space:
mode:
Diffstat (limited to 'InCallUI/res/layout/caller_in_conference.xml')
-rw-r--r--InCallUI/res/layout/caller_in_conference.xml79
1 files changed, 43 insertions, 36 deletions
diff --git a/InCallUI/res/layout/caller_in_conference.xml b/InCallUI/res/layout/caller_in_conference.xml
index 924bc6305..0d15eb10f 100644
--- a/InCallUI/res/layout/caller_in_conference.xml
+++ b/InCallUI/res/layout/caller_in_conference.xml
@@ -19,44 +19,39 @@
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="horizontal"
- android:gravity="center_vertical">
+ android:gravity="center_vertical"
+ android:paddingStart="16dp"
+ android:paddingEnd="8dp">
<!-- Caller information -->
<LinearLayout
- android:id="@+id/conferenceCallerSeparate"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
- android:background="?android:attr/selectableItemBackground"
- android:paddingStart="16dp"
android:orientation="horizontal"
android:gravity="center_vertical">
- <!-- "Separate" (i.e. "go private") button for this caller -->
- <ImageView
- android:src="@drawable/ic_split_holo_dark"
- android:layout_width="46dp"
- android:layout_height="46dp"
- android:scaleType="center"
- android:contentDescription="@string/goPrivate"/>
+ <ImageView android:id="@+id/callerPhoto"
+ android:layout_width="@dimen/contact_browser_list_item_photo_size"
+ android:layout_height="@dimen/contact_browser_list_item_photo_size" />
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="8dp"
- android:gravity="center_vertical"
- android:orientation="vertical">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:orientation="vertical"
+ android:layout_marginStart="16dp"
+ android:paddingBottom="2dp">
<!-- Name or number of this caller -->
- <TextView
- android:id="@+id/conferenceCallerName"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="18sp"
- android:singleLine="true"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginEnd="2dp"
- />
+ <TextView android:id="@+id/conferenceCallerName"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="16sp"
+ android:textColor="@color/conference_call_manager_caller_name_text_color"
+ android:singleLine="true"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="2dp" />
<!-- Number of this caller if name is supplied above -->
<LinearLayout
@@ -72,7 +67,7 @@
android:layout_height="wrap_content"
android:textSize="14sp"
android:ellipsize="marquee"
- android:textColor="@color/manage_conference_secondary_text_color"
+ android:textColor="@color/conference_call_manager_secondary_text_color"
android:singleLine="true"
android:layout_marginEnd="8dp" />
@@ -82,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
- android:textColor="@color/manage_conference_secondary_text_color"
+ android:textColor="@color/conference_call_manager_secondary_text_color"
android:ellipsize="marquee"
android:singleLine="true"
android:textAllCaps="true"
@@ -91,17 +86,29 @@
</LinearLayout> <!-- End of caller number -->
</LinearLayout> <!-- End of caller information -->
+
</LinearLayout>
- <!-- "End" button for this caller which should look like the
- "end call" button in the main in-call UI screen -->
+ <!-- "Separate" (i.e. "go private") button for this caller -->
+ <ImageView android:id="@+id/conferenceCallerSeparate"
+ android:src="@drawable/ic_call_split_white_24dp"
+ android:layout_width="@dimen/conference_call_manager_button_dimension"
+ android:layout_height="@dimen/conference_call_manager_button_dimension"
+ android:scaleType="center"
+ android:contentDescription="@string/goPrivate"
+ android:tint="@color/conference_call_manager_icon_color"
+ android:background="?android:attr/selectableItemBackgroundBorderless" />
+
+ <!-- "Disconnect" button which terminates the connection with this caller. -->
<ImageButton
- android:id="@+id/conferenceCallerDisconnect"
- android:layout_width="80dp"
- android:layout_height="match_parent"
- android:src="@drawable/ic_in_call_phone_hangup"
- android:background="@drawable/end_call_background"
- android:scaleType="center"
- android:contentDescription="@string/onscreenEndCallText" />
+ android:id="@+id/conferenceCallerDisconnect"
+ android:layout_width="@dimen/conference_call_manager_button_dimension"
+ android:layout_height="@dimen/conference_call_manager_button_dimension"
+ android:layout_marginStart="8dp"
+ android:src="@drawable/ic_call_end_white_24dp"
+ android:scaleType="center"
+ android:contentDescription="@string/onscreenEndCallText"
+ android:tint="@color/conference_call_manager_icon_color"
+ android:background="?android:attr/selectableItemBackgroundBorderless" />
</LinearLayout> <!-- End of single list element -->