From a676d20db28770c386d610ba492bd9c58a10e0d3 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Mon, 18 Aug 2014 13:58:15 -0700 Subject: Asset swap for InCallUI Bug: 17112104 Change-Id: I85ec1fda31ce626368c722c4de95f558b0b523d7 --- InCallUI/res/drawable-hdpi/business_unknown.png | Bin 1696 -> 0 bytes InCallUI/res/drawable-hdpi/img_business.png | Bin 0 -> 3311 bytes InCallUI/res/drawable-hdpi/img_emergency.png | Bin 0 -> 5870 bytes InCallUI/res/drawable-hdpi/picture_emergency.png | Bin 2519 -> 0 bytes InCallUI/res/drawable-mdpi/business_unknown.png | Bin 1352 -> 0 bytes InCallUI/res/drawable-mdpi/img_business.png | Bin 0 -> 2240 bytes InCallUI/res/drawable-mdpi/img_emergency.png | Bin 0 -> 3882 bytes InCallUI/res/drawable-mdpi/picture_emergency.png | Bin 5136 -> 0 bytes InCallUI/res/drawable-xhdpi/business_unknown.png | Bin 2450 -> 0 bytes InCallUI/res/drawable-xhdpi/img_business.png | Bin 0 -> 4759 bytes InCallUI/res/drawable-xhdpi/img_emergency.png | Bin 0 -> 8943 bytes InCallUI/res/drawable-xhdpi/picture_emergency.png | Bin 9521 -> 0 bytes InCallUI/res/drawable-xxhdpi/business_unknown.png | Bin 3075 -> 0 bytes InCallUI/res/drawable-xxhdpi/img_business.png | Bin 0 -> 6499 bytes InCallUI/res/drawable-xxhdpi/img_emergency.png | Bin 0 -> 10848 bytes InCallUI/src/com/android/incallui/CallerInfo.java | 2 +- InCallUI/src/com/android/incallui/ContactInfoCache.java | 2 +- 17 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 InCallUI/res/drawable-hdpi/business_unknown.png create mode 100644 InCallUI/res/drawable-hdpi/img_business.png create mode 100644 InCallUI/res/drawable-hdpi/img_emergency.png delete mode 100644 InCallUI/res/drawable-hdpi/picture_emergency.png delete mode 100644 InCallUI/res/drawable-mdpi/business_unknown.png create mode 100644 InCallUI/res/drawable-mdpi/img_business.png create mode 100644 InCallUI/res/drawable-mdpi/img_emergency.png delete mode 100644 InCallUI/res/drawable-mdpi/picture_emergency.png delete mode 100644 InCallUI/res/drawable-xhdpi/business_unknown.png create mode 100644 InCallUI/res/drawable-xhdpi/img_business.png create mode 100644 InCallUI/res/drawable-xhdpi/img_emergency.png delete mode 100644 InCallUI/res/drawable-xhdpi/picture_emergency.png delete mode 100644 InCallUI/res/drawable-xxhdpi/business_unknown.png create mode 100644 InCallUI/res/drawable-xxhdpi/img_business.png create mode 100644 InCallUI/res/drawable-xxhdpi/img_emergency.png (limited to 'InCallUI') diff --git a/InCallUI/res/drawable-hdpi/business_unknown.png b/InCallUI/res/drawable-hdpi/business_unknown.png deleted file mode 100644 index b369939ec..000000000 Binary files a/InCallUI/res/drawable-hdpi/business_unknown.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/img_business.png b/InCallUI/res/drawable-hdpi/img_business.png new file mode 100644 index 000000000..f70634262 Binary files /dev/null and b/InCallUI/res/drawable-hdpi/img_business.png differ diff --git a/InCallUI/res/drawable-hdpi/img_emergency.png b/InCallUI/res/drawable-hdpi/img_emergency.png new file mode 100644 index 000000000..7e5eff48d Binary files /dev/null and b/InCallUI/res/drawable-hdpi/img_emergency.png differ diff --git a/InCallUI/res/drawable-hdpi/picture_emergency.png b/InCallUI/res/drawable-hdpi/picture_emergency.png deleted file mode 100644 index 0e13a4385..000000000 Binary files a/InCallUI/res/drawable-hdpi/picture_emergency.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/business_unknown.png b/InCallUI/res/drawable-mdpi/business_unknown.png deleted file mode 100644 index eac97a9b7..000000000 Binary files a/InCallUI/res/drawable-mdpi/business_unknown.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/img_business.png b/InCallUI/res/drawable-mdpi/img_business.png new file mode 100644 index 000000000..90738a7ee Binary files /dev/null and b/InCallUI/res/drawable-mdpi/img_business.png differ diff --git a/InCallUI/res/drawable-mdpi/img_emergency.png b/InCallUI/res/drawable-mdpi/img_emergency.png new file mode 100644 index 000000000..0209eb9d1 Binary files /dev/null and b/InCallUI/res/drawable-mdpi/img_emergency.png differ diff --git a/InCallUI/res/drawable-mdpi/picture_emergency.png b/InCallUI/res/drawable-mdpi/picture_emergency.png deleted file mode 100644 index a224b8000..000000000 Binary files a/InCallUI/res/drawable-mdpi/picture_emergency.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/business_unknown.png b/InCallUI/res/drawable-xhdpi/business_unknown.png deleted file mode 100644 index aa84456e4..000000000 Binary files a/InCallUI/res/drawable-xhdpi/business_unknown.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/img_business.png b/InCallUI/res/drawable-xhdpi/img_business.png new file mode 100644 index 000000000..7b04d956f Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/img_business.png differ diff --git a/InCallUI/res/drawable-xhdpi/img_emergency.png b/InCallUI/res/drawable-xhdpi/img_emergency.png new file mode 100644 index 000000000..5c00d9d55 Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/img_emergency.png differ diff --git a/InCallUI/res/drawable-xhdpi/picture_emergency.png b/InCallUI/res/drawable-xhdpi/picture_emergency.png deleted file mode 100644 index 08b421eef..000000000 Binary files a/InCallUI/res/drawable-xhdpi/picture_emergency.png and /dev/null differ diff --git a/InCallUI/res/drawable-xxhdpi/business_unknown.png b/InCallUI/res/drawable-xxhdpi/business_unknown.png deleted file mode 100644 index 6273bb324..000000000 Binary files a/InCallUI/res/drawable-xxhdpi/business_unknown.png and /dev/null differ diff --git a/InCallUI/res/drawable-xxhdpi/img_business.png b/InCallUI/res/drawable-xxhdpi/img_business.png new file mode 100644 index 000000000..c17e4c9d8 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/img_business.png differ diff --git a/InCallUI/res/drawable-xxhdpi/img_emergency.png b/InCallUI/res/drawable-xxhdpi/img_emergency.png new file mode 100644 index 000000000..4eaaba509 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/img_emergency.png differ diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java index 044bdba65..138575a14 100644 --- a/InCallUI/src/com/android/incallui/CallerInfo.java +++ b/InCallUI/src/com/android/incallui/CallerInfo.java @@ -333,7 +333,7 @@ public class CallerInfo { // should be displayed. /* package */ CallerInfo markAsEmergency(Context context) { phoneNumber = context.getString(R.string.emergency_call_dialog_number_for_display); - photoResource = R.drawable.picture_emergency; + photoResource = R.drawable.img_emergency; mIsEmergency = true; return this; } diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java index d81acb2d9..ccf5b794b 100644 --- a/InCallUI/src/com/android/incallui/ContactInfoCache.java +++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java @@ -233,7 +233,7 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete // If no image and it's a business, switch to using the default business avatar. if (info.getImageUrl() == null && info.isBusiness()) { Log.d(TAG, "Business has no image. Using default."); - entry.photo = mContext.getResources().getDrawable(R.drawable.business_unknown); + entry.photo = mContext.getResources().getDrawable(R.drawable.img_business); } // Add the contact info to the cache. -- cgit v1.2.3