Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbf199cd authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: Ic130aca52a74fc9273530d06e98d6b94769ab929
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fca843bb 8bee552d

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();

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

+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),