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/call_card_content.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/call_card_content.xml')
| -rw-r--r-- | InCallUI/res/layout/call_card_content.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml index 6d0ee8802..28eb1e23a 100644 --- a/InCallUI/res/layout/call_card_content.xml +++ b/InCallUI/res/layout/call_card_content.xml @@ -102,7 +102,8 @@ <include layout="@layout/manage_conference_call_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignTop="@id/photo" /> + android:layout_alignTop="@id/photo" + android:elevation="@dimen/secondary_call_elevation" /> <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. --> <FrameLayout @@ -111,7 +112,8 @@ android:layout_gravity="bottom|center_horizontal" android:layout_alignParentBottom="true" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:elevation="@dimen/dialpad_elevation" /> <fragment android:name="com.android.incallui.AnswerFragment" android:id="@+id/answerFragment" |