diff options
| author | Android Dialer <noreply@google.com> | 2018-06-01 08:04:36 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-06-01 18:20:21 -0700 |
| commit | 6ad72f66016237c763a2a754ceb8b3a27ed7dff8 (patch) | |
| tree | 304fa50ed5a531b20a311568fdea44a7a53f00e0 /java | |
| parent | f85644637b808d6a88886e462c1f8fd5f53a6f2f (diff) | |
Updating PhotoInfo and GlidePhotoManager to support conference calls.
Bug: 76205353
Test: GlidePhotoManagerImplTest
PiperOrigin-RevId: 198872893
Change-Id: I7957078a63af2455e439286b8d2ef719d4c9ff4e
Diffstat (limited to 'java')
3 files changed, 7 insertions, 3 deletions
diff --git a/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java b/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java index eeeae13ae..bd9cc31e4 100644 --- a/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java +++ b/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java @@ -143,7 +143,7 @@ public class GlidePhotoManagerImpl implements GlidePhotoManager { photoInfo.getIsSpam(), photoInfo.getIsBusiness(), TelecomManager.PRESENTATION_ALLOWED, // TODO(twyen):implement - false)); // TODO(twyen):implement + photoInfo.getIsConference())); return letterTileDrawable; } diff --git a/java/com/android/dialer/glidephotomanager/photo_info.proto b/java/com/android/dialer/glidephotomanager/photo_info.proto index 6fa21d886..07908d807 100644 --- a/java/com/android/dialer/glidephotomanager/photo_info.proto +++ b/java/com/android/dialer/glidephotomanager/photo_info.proto @@ -9,7 +9,7 @@ package com.android.dialer.glidephotomanager; // Contains information associated with a number, which is used to create the // photo. -// Next ID: 12 +// Next ID: 13 message PhotoInfo { // The display name of the number. optional string name = 1; @@ -44,4 +44,7 @@ message PhotoInfo { // Whether the photo should be badged as RTT call. optional bool is_rtt = 11; + + // Whether to show conference call icon instead of contact icon. + optional bool is_conference = 12; } diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java index e375bd574..189f6fef1 100644 --- a/java/com/android/incallui/contactgrid/ContactGridManager.java +++ b/java/com/android/incallui/contactgrid/ContactGridManager.java @@ -318,7 +318,8 @@ public class ContactGridManager { PhotoInfo.newBuilder() .setIsBusiness(primaryInfo.photoType() == ContactPhotoType.BUSINESS) .setIsVoicemail(primaryCallState.isVoiceMailNumber()) - .setIsSpam(primaryInfo.isSpam()); + .setIsSpam(primaryInfo.isSpam()) + .setIsConference(primaryCallState.isConference()); // Contact has a name, that is a number. if (primaryInfo.nameIsNumber() && primaryInfo.number() != null) { |