From 6e7db002e35ba4113e00bf9b865bb519a73941f0 Mon Sep 17 00:00:00 2001 From: Priyanka Date: Thu, 23 Sep 2021 13:51:09 +0000 Subject: [PATCH] Update PipClose to PipExpand. PIP_CLOSE is being renamed to PIP_EXPAND. Frontend updated so transition can still be displayed. Bug: b/199882679 Test: run a trace and expand pip. Generate tags to check they have displayed correctly. Change-Id: I3e13f417d2784f4b1d56d7e3f73cfafbf788766b --- tools/winscope/src/flickerlib/tags/Tag.ts | 2 +- tools/winscope/src/flickerlib/tags/TransitionType.ts | 2 +- tools/winscope/src/utils/consts.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winscope/src/flickerlib/tags/Tag.ts b/tools/winscope/src/flickerlib/tags/Tag.ts index fdaa373a4..25a50a307 100644 --- a/tools/winscope/src/flickerlib/tags/Tag.ts +++ b/tools/winscope/src/flickerlib/tags/Tag.ts @@ -22,7 +22,7 @@ const transitionTypeMap = new Map([ ['ROTATION', TransitionType.ROTATION], ['PIP_ENTER', TransitionType.PIP_ENTER], ['PIP_RESIZE', TransitionType.PIP_RESIZE], - ['PIP_CLOSE', TransitionType.PIP_CLOSE], + ['PIP_EXPAND', TransitionType.PIP_EXPAND], ['PIP_EXIT', TransitionType.PIP_EXIT], ['APP_LAUNCH', TransitionType.APP_LAUNCH], ['APP_CLOSE', TransitionType.APP_CLOSE], diff --git a/tools/winscope/src/flickerlib/tags/TransitionType.ts b/tools/winscope/src/flickerlib/tags/TransitionType.ts index b4e376abd..ac5d02d16 100644 --- a/tools/winscope/src/flickerlib/tags/TransitionType.ts +++ b/tools/winscope/src/flickerlib/tags/TransitionType.ts @@ -18,7 +18,7 @@ enum TransitionType { ROTATION = 'ROTATION', PIP_ENTER = 'PIP_ENTER', PIP_RESIZE ='PIP_RESIZE', - PIP_CLOSE = 'PIP_CLOSE', + PIP_EXPAND = 'PIP_EXPAND', PIP_EXIT = 'PIP_EXIT', APP_LAUNCH = 'APP_LAUNCH', APP_CLOSE = 'APP_CLOSE', diff --git a/tools/winscope/src/utils/consts.js b/tools/winscope/src/utils/consts.js index ca71b1ff6..4be6a4419 100644 --- a/tools/winscope/src/utils/consts.js +++ b/tools/winscope/src/utils/consts.js @@ -52,7 +52,7 @@ const transitionMap = new Map([ [TransitionType.ROTATION, {desc: 'Rotation', color: '#9900ffff'}], [TransitionType.PIP_ENTER, {desc: 'Entering PIP mode', color: '#4a86e8ff'}], [TransitionType.PIP_RESIZE, {desc: 'Resizing PIP mode', color: '#2b9e94ff'}], - [TransitionType.PIP_CLOSE, {desc: 'Closing PIP mode', color: 'rgb(57, 57, 182)'}], + [TransitionType.PIP_EXPAND, {desc: 'Expanding PIP mode', color: 'rgb(57, 57, 182)'}], [TransitionType.PIP_EXIT, {desc: 'Exiting PIP mode', color: 'darkblue'}], [TransitionType.APP_LAUNCH, {desc: 'Launching app', color: '#ef6befff'}], [TransitionType.APP_CLOSE, {desc: 'Closing app', color: '#d10ddfff'}],