Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add UiEvent logging for auto-PiP and content-PiP" into tm-qpr-dev am: 345126e4c0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21407360

Change-Id: If373ab81710bded68d09167a7bee4e25ef8061b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2023-02-14 18:54:47 +00:00
committed by Automerger Merge Worker
parent fc523aed63 345126e4c0
commit 8bee552ddd
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
View File

@@ -650,7 +650,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
} }
mPipUiEventLoggerLogger.setTaskInfo(mTaskInfo); mPipUiEventLoggerLogger.setTaskInfo(mTaskInfo);
mPipUiEventLoggerLogger.log(PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_ENTER);
// If the displayId of the task is different than what PipBoundsHandler has, then update // If the displayId of the task is different than what PipBoundsHandler has, then update
// it. This is possible if we entered PiP on an external display. // it. This is possible if we entered PiP on an external display.
@@ -659,6 +658,17 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
mOnDisplayIdChangeCallback.accept(info.displayId); mOnDisplayIdChangeCallback.accept(info.displayId);
} }
// UiEvent logging.
final PipUiEventLogger.PipUiEventEnum uiEventEnum;
if (isLaunchIntoPipTask()) {
uiEventEnum = PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_ENTER_CONTENT_PIP;
} else if (mPipTransitionState.getInSwipePipToHomeTransition()) {
uiEventEnum = PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_AUTO_ENTER;
} else {
uiEventEnum = PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_ENTER;
}
mPipUiEventLoggerLogger.log(uiEventEnum);
if (mPipTransitionState.getInSwipePipToHomeTransition()) { if (mPipTransitionState.getInSwipePipToHomeTransition()) {
if (!mWaitForFixedRotation) { if (!mWaitForFixedRotation) {
onEndOfSwipePipToHomeTransition(); onEndOfSwipePipToHomeTransition();

6
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipUiEventLogger.java
View File

@@ -78,6 +78,12 @@ public class PipUiEventLogger {
@UiEvent(doc = "Activity enters picture-in-picture mode") @UiEvent(doc = "Activity enters picture-in-picture mode")
PICTURE_IN_PICTURE_ENTER(603), PICTURE_IN_PICTURE_ENTER(603),
@UiEvent(doc = "Activity enters picture-in-picture mode with auto-enter-pip API")
PICTURE_IN_PICTURE_AUTO_ENTER(1313),
@UiEvent(doc = "Activity enters picture-in-picture mode from content-pip API")
PICTURE_IN_PICTURE_ENTER_CONTENT_PIP(1314),
@UiEvent(doc = "Expands from picture-in-picture to fullscreen") @UiEvent(doc = "Expands from picture-in-picture to fullscreen")
PICTURE_IN_PICTURE_EXPAND_TO_FULLSCREEN(604), PICTURE_IN_PICTURE_EXPAND_TO_FULLSCREEN(604),