diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-12 00:30:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-12 00:30:25 +0000 |
| commit | b6c726478015f3be180c3f854cba4b27cf9c31ee (patch) | |
| tree | 7cc32b127706e39d1441775c45865d7c98ff3c4c /java | |
| parent | 8d3e0f2c0d268c1fda560577e874025b300875df (diff) | |
| parent | c875a5b7630376c767d86b708e4aab8382de8acc (diff) | |
Merge "Also show bubble avatar for incoming call and outgoing call."
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/incallui/NewReturnToCallController.java | 8 | ||||
| -rw-r--r-- | java/com/android/newbubble/NewBubbleInfo.java | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java index abff000fd..95da1c65e 100644 --- a/java/com/android/incallui/NewReturnToCallController.java +++ b/java/com/android/incallui/NewReturnToCallController.java @@ -205,7 +205,13 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au } private void startContactInfoSearch() { - DialerCall dialerCall = CallList.getInstance().getActiveOrBackgroundCall(); + DialerCall dialerCall = CallList.getInstance().getIncomingCall(); + if (dialerCall == null) { + dialerCall = CallList.getInstance().getOutgoingCall(); + } + if (dialerCall == null) { + dialerCall = CallList.getInstance().getActiveOrBackgroundCall(); + } if (dialerCall != null) { contactInfoCache.findInfo( dialerCall, false /* isIncoming */, new ReturnToCallContactInfoCacheCallback(this)); diff --git a/java/com/android/newbubble/NewBubbleInfo.java b/java/com/android/newbubble/NewBubbleInfo.java index 126b300ed..ec26a3143 100644 --- a/java/com/android/newbubble/NewBubbleInfo.java +++ b/java/com/android/newbubble/NewBubbleInfo.java @@ -53,7 +53,8 @@ public abstract class NewBubbleInfo { .setPrimaryColor(bubbleInfo.getPrimaryColor()) .setPrimaryIcon(bubbleInfo.getPrimaryIcon()) .setStartingYPosition(bubbleInfo.getStartingYPosition()) - .setActions(bubbleInfo.getActions()); + .setActions(bubbleInfo.getActions()) + .setAvatar(bubbleInfo.getAvatar()); } /** Builder for {@link NewBubbleInfo} */ |