From 3a7108ae5fc630730457957629b1115dcc991454 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 25 Aug 2014 12:19:35 -0700 Subject: 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 --- InCallUI/res/drawable-hdpi/ic_call_end_white_24dp.png | Bin 0 -> 454 bytes InCallUI/res/drawable-hdpi/ic_call_split_white_24dp.png | Bin 0 -> 326 bytes InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png | Bin 1794 -> 0 bytes InCallUI/res/drawable-hdpi/ic_split_holo_dark.png | Bin 1893 -> 0 bytes InCallUI/res/drawable-hdpi/img_conference.png | Bin 0 -> 7037 bytes InCallUI/res/drawable-hdpi/picture_conference.png | Bin 3522 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 InCallUI/res/drawable-hdpi/ic_call_end_white_24dp.png create mode 100644 InCallUI/res/drawable-hdpi/ic_call_split_white_24dp.png delete mode 100644 InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png delete mode 100644 InCallUI/res/drawable-hdpi/ic_split_holo_dark.png create mode 100644 InCallUI/res/drawable-hdpi/img_conference.png delete mode 100644 InCallUI/res/drawable-hdpi/picture_conference.png (limited to 'InCallUI/res/drawable-hdpi') diff --git a/InCallUI/res/drawable-hdpi/ic_call_end_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_call_end_white_24dp.png new file mode 100644 index 000000000..757d339c4 Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_call_end_white_24dp.png differ diff --git a/InCallUI/res/drawable-hdpi/ic_call_split_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_call_split_white_24dp.png new file mode 100644 index 000000000..4e3dbf55d Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_call_split_white_24dp.png differ diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png b/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png deleted file mode 100644 index d6f26f22c..000000000 Binary files a/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/ic_split_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_split_holo_dark.png deleted file mode 100644 index 5b10cf948..000000000 Binary files a/InCallUI/res/drawable-hdpi/ic_split_holo_dark.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/img_conference.png b/InCallUI/res/drawable-hdpi/img_conference.png new file mode 100644 index 000000000..3d9f683a5 Binary files /dev/null and b/InCallUI/res/drawable-hdpi/img_conference.png differ diff --git a/InCallUI/res/drawable-hdpi/picture_conference.png b/InCallUI/res/drawable-hdpi/picture_conference.png deleted file mode 100644 index 93743e620..000000000 Binary files a/InCallUI/res/drawable-hdpi/picture_conference.png and /dev/null differ -- cgit v1.2.3