From c12b72ac707b30c3bc1b6804fba2635084147cc7 Mon Sep 17 00:00:00 2001
From: Pablo Gamito <pablogamito@google.com>
Date: Tue, 23 May 2023 14:48:02 +0000
Subject: [PATCH] Add status to transition rows

Bug: 277181336
Test: npm run test:all
Change-Id: I7eb981367191a47d3b50b31ee68492844936923a
---
 .../viewer_transitions_component.ts           | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/tools/winscope/src/viewers/viewer_transitions/viewer_transitions_component.ts b/tools/winscope/src/viewers/viewer_transitions/viewer_transitions_component.ts
index 4ce4e3200..f214bfc07 100644
--- a/tools/winscope/src/viewers/viewer_transitions/viewer_transitions_component.ts
+++ b/tools/winscope/src/viewers/viewer_transitions/viewer_transitions_component.ts
@@ -33,6 +33,7 @@ import {UiData} from './ui_data';
             <div class="type">Type</div>
             <div class="send-time">Send Time</div>
             <div class="duration">Duration</div>
+            <div class="status">Status</div>
           </div>
           <cdk-virtual-scroll-viewport itemSize="53" class="scroll">
             <div
@@ -65,6 +66,35 @@ import {UiData} from './ui_data';
                 >
                 <span *ngIf="transition.sendTime.isMin || transition.finishTime.isMax">n/a</span>
               </div>
+              <div class="status">
+                <div *ngIf="transition.mergedInto">
+                  <span>MERGED</span>
+                  <mat-icon aria-hidden="false" fontIcon="merge" matTooltip="merged" icon-gray>
+                  </mat-icon>
+                </div>
+
+                <div *ngIf="transition.aborted && !transition.mergedInto">
+                  <span>ABORTED</span>
+                  <mat-icon
+                    aria-hidden="false"
+                    fontIcon="close"
+                    matTooltip="aborted"
+                    style="color: red"
+                    icon-red></mat-icon>
+                </div>
+
+                <div *ngIf="transition.played && !transition.aborted && !transition.mergedInto">
+                  <span>PLAYED</span>
+                  <mat-icon
+                    aria-hidden="false"
+                    fontIcon="check"
+                    matTooltip="played"
+                    style="color: green"
+                    *ngIf="
+                      transition.played && !transition.aborted && !transition.mergedInto
+                    "></mat-icon>
+                </div>
+              </div>
             </div>
           </cdk-virtual-scroll-viewport>
         </div>
@@ -192,6 +222,21 @@ import {UiData} from './ui_data';
         flex: 3;
       }
 
+      .table-row .status {
+        flex: 2;
+      }
+
+      .status > div {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        gap: 5px;
+      }
+
+      .current .status mat-icon {
+        color: white !important;
+      }
+
       .transition-timeline .row svg rect {
         cursor: pointer;
       }