diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-04 23:56:31 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-04 23:56:31 +0000 |
commit | 9f14cd7ee2e46185f80ce9c364b22687a1d651ff (patch) | |
tree | d2efff2512c24fa05f9fd87c383d4da3f89d4fe9 /java/com/android/dialer/widget/ContactPhotoView.java | |
parent | d5408c9423f20bef650ca838ff66bb5ecf60f818 (diff) | |
parent | 612d13a1295afb0f0b9e8217fc0efb211836c949 (diff) |
Merge changes If1ae5505,I65e9c6ac,I1a72ca86,I417b46ed,I60f97924
* changes:
Better support for multi call.
Migrate RTT chat history to use proto buffer.
Disable RTT request button when the call is not active yet.
Use the default phone account for a voice call when the call log item is for Duo.
Explicitly hide the badge in ContactPhotoView when it shouldn't be shown.
Diffstat (limited to 'java/com/android/dialer/widget/ContactPhotoView.java')
-rw-r--r-- | java/com/android/dialer/widget/ContactPhotoView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/com/android/dialer/widget/ContactPhotoView.java b/java/com/android/dialer/widget/ContactPhotoView.java index 6fcc89ab0..5020875dc 100644 --- a/java/com/android/dialer/widget/ContactPhotoView.java +++ b/java/com/android/dialer/widget/ContactPhotoView.java @@ -86,12 +86,15 @@ public final class ContactPhotoView extends FrameLayout { private void setBadge(PhotoInfo photoInfo) { // No badge for spam numbers. if (photoInfo.getIsSpam()) { + hideBadge(); return; } if (photoInfo.getIsVideo()) { contactBadgeContainer.setVisibility(View.VISIBLE); videoCallBadge.setVisibility(View.VISIBLE); + } else { + hideBadge(); } } } |