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 | 935b78cc1f7fe75cda63fbacbec2b706d28d446d (patch) | |
| tree | a20a79114cae7dbb1e28e2e90cc96f34877699dc | |
| parent | 28c55a37424ca3e5f5250a95555210d5c885eb90 (diff) | |
| parent | 94bfdf9070ab1bca6866f4c0caf971dad03446a2 (diff) | |
| download | InCallUI-935b78cc1f7fe75cda63fbacbec2b706d28d446d.tar.gz | |
Merge "Default to business avatar for businesses without an image." into klp-dev
| -rw-r--r-- | res/drawable-hdpi/business_unknown.png | bin | 0 -> 1696 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/picture_unknown.png | bin | 3503 -> 4910 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/business_unknown.png | bin | 0 -> 1352 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/picture_unknown.png | bin | 2378 -> 3249 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/business_unknown.png | bin | 0 -> 2450 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/picture_unknown.png | bin | 4829 -> 6931 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/business_unknown.png | bin | 0 -> 3075 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/picture_unknown.png | bin | 22053 -> 8707 bytes | |||
| -rw-r--r-- | src/com/android/incallui/ContactInfoCache.java | 6 | ||||
| -rw-r--r-- | src/com/android/incallui/service/PhoneNumberService.java | 1 |
10 files changed, 7 insertions, 0 deletions
diff --git a/res/drawable-hdpi/business_unknown.png b/res/drawable-hdpi/business_unknown.png Binary files differnew file mode 100644 index 00000000..b369939e --- /dev/null +++ b/res/drawable-hdpi/business_unknown.png diff --git a/res/drawable-hdpi/picture_unknown.png b/res/drawable-hdpi/picture_unknown.png Binary files differindex ba46da15..26d2be16 100644 --- a/res/drawable-hdpi/picture_unknown.png +++ b/res/drawable-hdpi/picture_unknown.png diff --git a/res/drawable-mdpi/business_unknown.png b/res/drawable-mdpi/business_unknown.png Binary files differnew file mode 100644 index 00000000..eac97a9b --- /dev/null +++ b/res/drawable-mdpi/business_unknown.png diff --git a/res/drawable-mdpi/picture_unknown.png b/res/drawable-mdpi/picture_unknown.png Binary files differindex 995df75b..1ee333ca 100644 --- a/res/drawable-mdpi/picture_unknown.png +++ b/res/drawable-mdpi/picture_unknown.png diff --git a/res/drawable-xhdpi/business_unknown.png b/res/drawable-xhdpi/business_unknown.png Binary files differnew file mode 100644 index 00000000..aa84456e --- /dev/null +++ b/res/drawable-xhdpi/business_unknown.png diff --git a/res/drawable-xhdpi/picture_unknown.png b/res/drawable-xhdpi/picture_unknown.png Binary files differindex b4bd3666..db74fd96 100644 --- a/res/drawable-xhdpi/picture_unknown.png +++ b/res/drawable-xhdpi/picture_unknown.png diff --git a/res/drawable-xxhdpi/business_unknown.png b/res/drawable-xxhdpi/business_unknown.png Binary files differnew file mode 100644 index 00000000..6273bb32 --- /dev/null +++ b/res/drawable-xxhdpi/business_unknown.png diff --git a/res/drawable-xxhdpi/picture_unknown.png b/res/drawable-xxhdpi/picture_unknown.png Binary files differindex 41275930..38bec2cf 100644 --- a/res/drawable-xxhdpi/picture_unknown.png +++ b/res/drawable-xxhdpi/picture_unknown.png diff --git a/src/com/android/incallui/ContactInfoCache.java b/src/com/android/incallui/ContactInfoCache.java index 13f8dd00..4b482cb4 100644 --- a/src/com/android/incallui/ContactInfoCache.java +++ b/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/src/com/android/incallui/service/PhoneNumberService.java b/src/com/android/incallui/service/PhoneNumberService.java index 942bf422..24303cdf 100644 --- a/src/com/android/incallui/service/PhoneNumberService.java +++ b/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(); } } |
