Merge "Add UiEvent logging for auto-PiP and content-PiP" into tm-qpr-dev (345126e4) · Commits · e / os / android_frameworks_base

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -650,7 +650,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		}

		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
		// 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);
		}

		// 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 (!mWaitForFixedRotation) {
		onEndOfSwipePipToHomeTransition();

+6 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,12 @@ public class PipUiEventLogger {
		@UiEvent(doc = "Activity enters picture-in-picture mode")
		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")
		PICTURE_IN_PICTURE_EXPAND_TO_FULLSCREEN(604),