summaryrefslogtreecommitdiff
path: root/InCallUI/res/drawable-hdpi
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-08-25 12:19:35 -0700
committerAndrew Lee <anwlee@google.com>2014-08-27 10:41:09 -0700
commit3a7108ae5fc630730457957629b1115dcc991454 (patch)
tree3d3ec5b7f9b6adc8608d5dbf0e00dc393e1cccc7 /InCallUI/res/drawable-hdpi
parent677b93933325b6ba617a765faffe76519504daeb (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/drawable-hdpi')
-rw-r--r--InCallUI/res/drawable-hdpi/ic_call_end_white_24dp.pngbin0 -> 454 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/ic_call_split_white_24dp.pngbin0 -> 326 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.pngbin1794 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/ic_split_holo_dark.pngbin1893 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/img_conference.pngbin0 -> 7037 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/picture_conference.pngbin3522 -> 0 bytes
6 files changed, 0 insertions, 0 deletions
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
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_call_end_white_24dp.png
Binary files 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
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_call_split_white_24dp.png
Binary files 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
--- a/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png
+++ /dev/null
Binary files 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
--- a/InCallUI/res/drawable-hdpi/ic_split_holo_dark.png
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/img_conference.png
Binary files 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
--- a/InCallUI/res/drawable-hdpi/picture_conference.png
+++ /dev/null
Binary files differ