diff options
| author | Andrew Lee <anwlee@google.com> | 2014-08-28 12:34:20 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-08-28 13:48:46 -0700 |
| commit | 0a0a01d28553ca2d18a26d9ccc77ebdfd1736a9f (patch) | |
| tree | 02ef78011075db00eefe5c90844080d1be17f1e8 /res/layout | |
| parent | f6282381fb7fd0107b930feaa59fa16db78927e6 (diff) | |
| download | packages_apps_InCallUI-0a0a01d28553ca2d18a26d9ccc77ebdfd1736a9f.tar.gz packages_apps_InCallUI-0a0a01d28553ca2d18a26d9ccc77ebdfd1736a9f.tar.bz2 packages_apps_InCallUI-0a0a01d28553ca2d18a26d9ccc77ebdfd1736a9f.zip | |
Add conference call icon to secondary call info.
Bug: 17304107
Change-Id: Icdc1de17f00d9b373c619675566de9d455c10066
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/manage_conference_call_button.xml | 4 | ||||
| -rw-r--r-- | res/layout/secondary_call_info.xml | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/res/layout/manage_conference_call_button.xml b/res/layout/manage_conference_call_button.xml index 375f8882..13d8fca5 100644 --- a/res/layout/manage_conference_call_button.xml +++ b/res/layout/manage_conference_call_button.xml @@ -38,12 +38,12 @@ android:layout_height="wrap_content" android:src="@drawable/ic_group_white_24dp" android:tint="@color/incall_banner_secondary_text_color" - android:contentDescription="@string/onscreenManageConferenceText" /> + android:contentDescription="@string/onscreenManageConferenceText" + android:paddingEnd="16dp" /> <TextView android:id="@+id/manageConferenceButtonLabel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="24dp" android:gravity="center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/incall_banner_secondary_text_color" diff --git a/res/layout/secondary_call_info.xml b/res/layout/secondary_call_info.xml index 8106dff0..46d7316c 100644 --- a/res/layout/secondary_call_info.xml +++ b/res/layout/secondary_call_info.xml @@ -36,11 +36,19 @@ android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding" android:background="?android:attr/selectableItemBackground"> + <ImageView android:id="@+id/secondaryCallConferenceCallIcon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_group_white_24dp" + android:tint="@color/incall_banner_secondary_text_color" + android:paddingEnd="16dp"/> + <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical"> + <!-- Name (or the phone number, if we don't have a name to display). --> <TextView android:id="@+id/secondaryCallName" android:layout_width="match_parent" @@ -49,18 +57,21 @@ android:textColor="@color/incall_banner_secondary_text_color" android:ellipsize="marquee" android:singleLine="true"/> + <!-- Provider, e.g. AT&T, that a call is associated with --> <LinearLayout android:id="@+id/secondary_call_provider_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:visibility="gone" > + <ImageView android:id="@+id/secondaryCallProviderIcon" android:layout_width="@dimen/call_provider_small_icon_size" android:layout_height="@dimen/call_provider_small_icon_size" android:layout_marginRight="2dp" android:baselineAlignBottom="true" android:scaleType="centerInside" /> + <TextView android:id="@+id/secondaryCallProviderLabel" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -68,7 +79,9 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/incall_banner_secondary_text_color" android:singleLine="true"/> + </LinearLayout> + </LinearLayout> <!-- Call status of the background call, usually the string "On hold". --> |