Use logCallImpression for bubble expand/collapse if possible.

So we can associate all bubble actions with call id, and analyze bubble actions per call session.

Also move code for sending primary action back to primaryButtonClick(), which is introduced in cl/167347311.

Test: manual
PiperOrigin-RevId: 169152088
Change-Id: I97f0971f162684d882f6addbc012f6e8552216b7

1 files changed, 26 insertions, 4 deletions

diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java
index fd48b37e1..89731bc0d 100644
--- a/java/com/android/incallui/ReturnToCallController.java
+++ b/java/com/android/incallui/ReturnToCallController.java
@@ -134,14 +134,36 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio
     returnToCallBubble.setBubbleExpansionStateListener(
         new BubbleExpansionStateListener() {
           @Override
-          public void onBubbleExpansionStateChanged(@ExpansionState int expansionState) {
+          public void onBubbleExpansionStateChanged(
+              @ExpansionState int expansionState, boolean isUserAction) {
+            if (!isUserAction) {
+              return;
+            }
+
+            DialerCall call = CallList.getInstance().getActiveOrBackgroundCall();
             switch (expansionState) {
               case ExpansionState.START_EXPANDING:
-                Logger.get(context)
-                    .logImpression(DialerImpression.Type.BUBBLE_PRIMARY_BUTTON_EXPAND);
+                if (call != null) {
+                  Logger.get(context)
+                      .logCallImpression(
+                          DialerImpression.Type.BUBBLE_PRIMARY_BUTTON_EXPAND,
+                          call.getUniqueCallId(),
+                          call.getTimeAddedMs());
+                } else {
+                  Logger.get(context)
+                      .logImpression(DialerImpression.Type.BUBBLE_PRIMARY_BUTTON_EXPAND);
+                }
                 break;
               case ExpansionState.START_COLLAPSING:
-                Logger.get(context).logImpression(DialerImpression.Type.BUBBLE_COLLAPSE_BY_USER);
+                if (call != null) {
+                  Logger.get(context)
+                      .logCallImpression(
+                          DialerImpression.Type.BUBBLE_COLLAPSE_BY_USER,
+                          call.getUniqueCallId(),
+                          call.getTimeAddedMs());
+                } else {
+                  Logger.get(context).logImpression(DialerImpression.Type.BUBBLE_COLLAPSE_BY_USER);
+                }
                 break;
               default:
                 break;