diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-25 12:19:35 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-08-27 10:41:09 -0700 |
commit | 3a7108ae5fc630730457957629b1115dcc991454 (patch) | |
tree | 3d3ec5b7f9b6adc8608d5dbf0e00dc393e1cccc7 /InCallUI/res/layout/secondary_call_info.xml | |
parent | 677b93933325b6ba617a765faffe76519504daeb (diff) |
Restyle conference call manager screen.
+ Swap out/in new assets for end/split icons in the manager screen,
and the splash screen in the InCall screen.
- Removed unused conference call manager code, including things like
chronometer and the "done" button.
+ Replaced custom action bar in conferece call manager with standard
action bar.
+ Added contact image (does not open quick contact) in the list of
calls in the conference call manager. This is done with a lookup
using the contact photo manager, and required adding the lookup key
to the ContactCacheEntry.
+ Handled a missing Call.State case in CallCardFragment for calls
with state CONFERENCED which caused crashes.
+ Misc style changes on conference call manager: colors, sizes,
paddings.
+ Adjusted elevations so dialpad covers manager/secondary buttons.
+ Added ripple to manager/secondary buttons.
Bug: 15862303
Change-Id: Iab9b6421d5a1ea69cd951a459d46c065f9456a8f
Diffstat (limited to 'InCallUI/res/layout/secondary_call_info.xml')
-rw-r--r-- | InCallUI/res/layout/secondary_call_info.xml | 97 |
1 files changed, 53 insertions, 44 deletions
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml index 237559d46..8106dff0b 100644 --- a/InCallUI/res/layout/secondary_call_info.xml +++ b/InCallUI/res/layout/secondary_call_info.xml @@ -16,64 +16,73 @@ <!-- XML resource file for secondary call info, which will be used by CallCard. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/secondary_call_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:orientation="horizontal" - android:paddingStart="@dimen/call_banner_side_padding" - android:paddingEnd="@dimen/secondary_call_banner_right_padding" - android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding" - android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding" android:background="@color/incall_banner_secondary_background_color" android:elevation="@dimen/secondary_call_elevation"> + <!-- This LinearLayout nested immediately in a FrameLayout is necessary to apply both a + background color and ripple to the button. --> <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" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - 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_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal" + android:paddingStart="@dimen/call_banner_side_padding" + android:paddingEnd="@dimen/secondary_call_banner_right_padding" + android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding" + android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding" + android:background="?android:attr/selectableItemBackground"> + + <LinearLayout + android:layout_width="0dp" 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_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" android:layout_height="wrap_content" - android:text="@string/onHold" android:textAppearance="?android:attr/textAppearanceMedium" 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" + android:text="@string/onHold" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/incall_banner_secondary_text_color" + android:singleLine="true"/> + </LinearLayout> </LinearLayout> - </LinearLayout> - <!-- Call status of the background call, usually the string "On hold". --> - <TextView android:id="@+id/secondaryCallStatus" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingEnd="@dimen/call_banner_side_padding" - android:text="@string/onHold" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/incall_banner_secondary_text_color" - android:textAlignment="textEnd" - android:singleLine="true" /> + <!-- Call status of the background call, usually the string "On hold". --> + <TextView android:id="@+id/secondaryCallStatus" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingEnd="@dimen/call_banner_side_padding" + android:text="@string/onHold" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/incall_banner_secondary_text_color" + android:textAlignment="textEnd" + android:singleLine="true" /> + + </LinearLayout> -</LinearLayout> +</FrameLayout> |