Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6c72647 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 8d3e0f2c c875a5b7

java/com/android/incallui/NewReturnToCallController.java

+7 −1
Original line number Diff line number Diff line
@@ -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));

java/com/android/newbubble/NewBubbleInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -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} */