summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/contactgrid
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-05-31 18:07:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-31 18:07:17 +0000
commitae06b1b3b86fcaffde9f94171bbb2b5649a95f14 (patch)
tree1f6349a450779c93e514fec9948d64e50d9b4e1e /java/com/android/incallui/contactgrid
parent7f7f25f903e4649f12aaa255b32bd20cb4079183 (diff)
parent83b20211c3be04a850de3674977deee8e448d17f (diff)
Update Dialer to v10 RC45.
am: 83b20211c3 Change-Id: Ide21415247a3ec743f5438c49d29ba2d861081b0
Diffstat (limited to 'java/com/android/incallui/contactgrid')
-rw-r--r--java/com/android/incallui/contactgrid/ContactGridManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java
index ed533be58..1322d58ea 100644
--- a/java/com/android/incallui/contactgrid/ContactGridManager.java
+++ b/java/com/android/incallui/contactgrid/ContactGridManager.java
@@ -245,6 +245,8 @@ public class ContactGridManager {
return LetterTileDrawable.TYPE_BUSINESS;
} else if (primaryInfo.numberPresentation == TelecomManager.PRESENTATION_RESTRICTED) {
return LetterTileDrawable.TYPE_GENERIC_AVATAR;
+ } else if (callState.isConference) {
+ return LetterTileDrawable.TYPE_CONFERENCE;
} else {
return LetterTileDrawable.TYPE_DEFAULT;
}