diff options
author | Chiao Cheng <chiaocheng@google.com> | 2013-10-02 18:28:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-02 18:28:48 +0000 |
commit | b62e45b7c8aec0946b9a3904295cdda35ce362ea (patch) | |
tree | cc9731ba7b536f156c8ce8e2cdbec50d9ce82e1d | |
parent | 0ebe68c2bd0342329c512c1c6031b477a5f12598 (diff) | |
parent | 2a97aff24301b785fb60c36dd134d879ca88b214 (diff) |
Merge "Default to business avatar for businesses without an image." into klp-dev
-rw-r--r-- | InCallUI/res/drawable-hdpi/business_unknown.png | bin | 0 -> 1696 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-hdpi/picture_unknown.png | bin | 3503 -> 4910 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/business_unknown.png | bin | 0 -> 1352 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/picture_unknown.png | bin | 2378 -> 3249 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/business_unknown.png | bin | 0 -> 2450 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/picture_unknown.png | bin | 4829 -> 6931 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxhdpi/business_unknown.png | bin | 0 -> 3075 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxhdpi/picture_unknown.png | bin | 22053 -> 8707 bytes | |||
-rw-r--r-- | InCallUI/src/com/android/incallui/ContactInfoCache.java | 6 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/service/PhoneNumberService.java | 1 |
10 files changed, 7 insertions, 0 deletions
diff --git a/InCallUI/res/drawable-hdpi/business_unknown.png b/InCallUI/res/drawable-hdpi/business_unknown.png Binary files differnew file mode 100644 index 000000000..b369939ec --- /dev/null +++ b/InCallUI/res/drawable-hdpi/business_unknown.png diff --git a/InCallUI/res/drawable-hdpi/picture_unknown.png b/InCallUI/res/drawable-hdpi/picture_unknown.png Binary files differindex ba46da151..26d2be16f 100644 --- a/InCallUI/res/drawable-hdpi/picture_unknown.png +++ b/InCallUI/res/drawable-hdpi/picture_unknown.png diff --git a/InCallUI/res/drawable-mdpi/business_unknown.png b/InCallUI/res/drawable-mdpi/business_unknown.png Binary files differnew file mode 100644 index 000000000..eac97a9b7 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/business_unknown.png diff --git a/InCallUI/res/drawable-mdpi/picture_unknown.png b/InCallUI/res/drawable-mdpi/picture_unknown.png Binary files differindex 995df75b3..1ee333caa 100644 --- a/InCallUI/res/drawable-mdpi/picture_unknown.png +++ b/InCallUI/res/drawable-mdpi/picture_unknown.png diff --git a/InCallUI/res/drawable-xhdpi/business_unknown.png b/InCallUI/res/drawable-xhdpi/business_unknown.png Binary files differnew file mode 100644 index 000000000..aa84456e4 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/business_unknown.png diff --git a/InCallUI/res/drawable-xhdpi/picture_unknown.png b/InCallUI/res/drawable-xhdpi/picture_unknown.png Binary files differindex b4bd3666a..db74fd962 100644 --- a/InCallUI/res/drawable-xhdpi/picture_unknown.png +++ b/InCallUI/res/drawable-xhdpi/picture_unknown.png diff --git a/InCallUI/res/drawable-xxhdpi/business_unknown.png b/InCallUI/res/drawable-xxhdpi/business_unknown.png Binary files differnew file mode 100644 index 000000000..6273bb324 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/business_unknown.png diff --git a/InCallUI/res/drawable-xxhdpi/picture_unknown.png b/InCallUI/res/drawable-xxhdpi/picture_unknown.png Binary files differindex 41275930d..38bec2cff 100644 --- a/InCallUI/res/drawable-xxhdpi/picture_unknown.png +++ b/InCallUI/res/drawable-xxhdpi/picture_unknown.png diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java index 13f8dd00d..4b482cb4c 100644 --- a/InCallUI/src/com/android/incallui/ContactInfoCache.java +++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java @@ -234,6 +234,12 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete entry.location = oldEntry.location; } + // 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); + } + // Add the contact info to the cache. mInfoMap.put(mCallId, entry); sendInfoNotifications(mCallId, entry); diff --git a/InCallUI/src/com/android/incallui/service/PhoneNumberService.java b/InCallUI/src/com/android/incallui/service/PhoneNumberService.java index 942bf422f..24303cdfd 100644 --- a/InCallUI/src/com/android/incallui/service/PhoneNumberService.java +++ b/InCallUI/src/com/android/incallui/service/PhoneNumberService.java @@ -67,5 +67,6 @@ public interface PhoneNumberService { public String getPhoneLabel(); public String getNormalizedNumber(); public String getImageUrl(); + public boolean isBusiness(); } } |