diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-31 08:53:10 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-05-31 08:53:10 -0700 |
commit | 83b20211c3be04a850de3674977deee8e448d17f (patch) | |
tree | a596b78feffa5d267b227762a2917da2e3eaf9c1 /java/com/android/incallui/contactgrid/ContactGridManager.java | |
parent | d40e05b9e0d8331a01af64e37730d177b9b948d5 (diff) |
Update Dialer to v10 RC45.
This release was created following the instructions at:
go/dialer-aosp-release
Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.
Version: 10
Candidate: RC45
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC45
This release contains the following bug fixes since RC39:
Bug: 38131932 38302993 38347350 38368993 38395481
62100344
Test: make, on device
Change-Id: Ib4af5dcc58c684d51ea1f4628b301e40184b81b3
Diffstat (limited to 'java/com/android/incallui/contactgrid/ContactGridManager.java')
-rw-r--r-- | java/com/android/incallui/contactgrid/ContactGridManager.java | 2 |
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; } |