From 68501ba893e9f733b260dc18cafdd89efa3d9937 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 19 Sep 2014 16:43:40 -0700 Subject: Update InCallUI for "generic" conference calls. + Use the newer "phone" asset (same as emergency calls). + Add xxxhdpi phone asset. - Remove unused assets. + Tint the subscription icon properly in secondary call info. + Reorganize listeners in CallCardFragment to be less redundant, and so FAB is properly positioned above the secondary call info. Bug: 17581379 Change-Id: Id4f1c1659ab8c17313cdd0393be51954b5cd449a --- InCallUI/res/drawable-hdpi/img_emergency.png | Bin 5870 -> 0 bytes InCallUI/res/drawable-hdpi/img_phone.png | Bin 0 -> 6157 bytes InCallUI/res/drawable-hdpi/picture_dialing.png | Bin 2509 -> 0 bytes InCallUI/res/drawable-hdpi/picture_unknown.png | Bin 5331 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 InCallUI/res/drawable-hdpi/img_emergency.png create mode 100644 InCallUI/res/drawable-hdpi/img_phone.png delete mode 100644 InCallUI/res/drawable-hdpi/picture_dialing.png delete mode 100644 InCallUI/res/drawable-hdpi/picture_unknown.png (limited to 'InCallUI/res/drawable-hdpi') diff --git a/InCallUI/res/drawable-hdpi/img_emergency.png b/InCallUI/res/drawable-hdpi/img_emergency.png deleted file mode 100644 index 7e5eff48d..000000000 Binary files a/InCallUI/res/drawable-hdpi/img_emergency.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/img_phone.png b/InCallUI/res/drawable-hdpi/img_phone.png new file mode 100644 index 000000000..748312e6e Binary files /dev/null and b/InCallUI/res/drawable-hdpi/img_phone.png differ diff --git a/InCallUI/res/drawable-hdpi/picture_dialing.png b/InCallUI/res/drawable-hdpi/picture_dialing.png deleted file mode 100644 index 6311f693b..000000000 Binary files a/InCallUI/res/drawable-hdpi/picture_dialing.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/picture_unknown.png b/InCallUI/res/drawable-hdpi/picture_unknown.png deleted file mode 100644 index 297480e5f..000000000 Binary files a/InCallUI/res/drawable-hdpi/picture_unknown.png and /dev/null differ -- cgit v1.2.3