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

Commit d6b8235b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add logs for syncing pip state" into main

parents 40957714 5315da16

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

+3 −0
Original line number Diff line number Diff line
@@ -1344,6 +1344,9 @@ public class PipTransition extends PipTransitionController { 
        final SurfaceControl leash = pipChange.getLeash();

        final Rect destBounds = mPipOrganizer.getCurrentOrAnimatingBounds();

        final boolean isInPip = mPipTransitionState.isInPip();

        ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                "%s: Update pip for unhandled transition, change=%s, destBounds=%s, isInPip=%b",

                TAG, pipChange, destBounds, isInPip);

        mSurfaceTransactionHelper

                .crop(startTransaction, leash, destBounds)

                .round(startTransaction, leash, isInPip)

services/core/java/com/android/server/wm/Task.java

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ADD_REMOVE; 
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_LOCKTASK;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_STATES;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_TASKS;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS_MIN;

import static com.android.server.wm.ActivityRecord.State.PAUSED;

import static com.android.server.wm.ActivityRecord.State.PAUSING;

import static com.android.server.wm.ActivityRecord.State.RESUMED;
@@ -6177,6 +6178,8 @@ class Task extends TaskFragment { 


    void maybeApplyLastRecentsAnimationTransaction() {

        if (mLastRecentsAnimationTransaction != null) {

            ProtoLog.d(WM_DEBUG_WINDOW_TRANSITIONS_MIN,

                    "Applying last recents animation transaction.");

            final SurfaceControl.Transaction tx = getPendingTransaction();

            if (mLastRecentsAnimationOverlay != null) {

                tx.reparent(mLastRecentsAnimationOverlay, mSurfaceControl);