commit b6c726478015f3be180c3f854cba4b27cf9c31ee
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 12 00:30:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 12 00:30:25 2017 +0000
tree 7cc32b127706e39d1441775c45865d7c98ff3c4c
parent 8d3e0f2c0d268c1fda560577e874025b300875df
parent c875a5b7630376c767d86b708e4aab8382de8acc

Merge "Also show bubble avatar for incoming call and outgoing call."

java/com/android/incallui/NewReturnToCallController.java

diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java
index abff000..95da1c6 100644
--- a/java/com/android/incallui/NewReturnToCallController.java
+++ b/java/com/android/incallui/NewReturnToCallController.java
@@ -205,7 +205,13 @@
   }
 
   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));

java/com/android/newbubble/NewBubbleInfo.java

diff --git a/java/com/android/newbubble/NewBubbleInfo.java b/java/com/android/newbubble/NewBubbleInfo.java
index 126b300..ec26a31 100644
--- a/java/com/android/newbubble/NewBubbleInfo.java
+++ b/java/com/android/newbubble/NewBubbleInfo.java
@@ -53,7 +53,8 @@
         .setPrimaryColor(bubbleInfo.getPrimaryColor())
         .setPrimaryIcon(bubbleInfo.getPrimaryIcon())
         .setStartingYPosition(bubbleInfo.getStartingYPosition())
-        .setActions(bubbleInfo.getActions());
+        .setActions(bubbleInfo.getActions())
+        .setAvatar(bubbleInfo.getAvatar());
   }
 
   /** Builder for {@link NewBubbleInfo} */