From c875a5b7630376c767d86b708e4aab8382de8acc Mon Sep 17 00:00:00 2001
From: yueg <yueg@google.com>
Date: Mon, 11 Dec 2017 14:40:13 -0800
Subject: Also show bubble avatar for incoming call and outgoing call.

Instead of just showing avatar for active or background call, we should also show avatar for other calls. In the order:
1. incoming call
2. outgoing call
3. active or background call

Test: NewReturnToCallControllerTest
PiperOrigin-RevId: 178675371
Change-Id: Ibf8b757821d9a6420ba56439e4f6a93e9e5c3d91
---
 java/com/android/newbubble/NewBubbleInfo.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'java/com/android/newbubble/NewBubbleInfo.java')

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} */
-- 
cgit v1.2.3