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

Commit 15c612fb authored by Robert Horvath's avatar Robert Horvath Committed by Automerger Merge Worker
Browse files

Merge "Set TvPipController's state only when PiP finished appearing" into tm-dev am: b987e545 

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

Change-Id: Ia41a8f6e29b22672260a02473e4d894bdb7f8f6e
parents 9542159f b987e545

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

+4 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.wm.shell.common.TaskStackListenerCallback; 
import com.android.wm.shell.common.TaskStackListenerImpl;

import com.android.wm.shell.pip.PinnedStackListenerForwarder;

import com.android.wm.shell.pip.Pip;

import com.android.wm.shell.pip.PipAnimationController;

import com.android.wm.shell.pip.PipMediaController;

import com.android.wm.shell.pip.PipTaskOrganizer;

import com.android.wm.shell.pip.PipTransitionController;
@@ -289,7 +290,6 @@ public class TvPipController implements PipTransitionController.PipTransitionCal 
        if (DEBUG) Log.d(TAG, "checkIfPinnedTaskAppeared(), task=" + pinnedTask);

        if (pinnedTask == null || pinnedTask.topActivity == null) return;

        mPinnedTaskId = pinnedTask.taskId;

        setState(STATE_PIP);



        mPipMediaController.onActivityPinned();

        mPipNotificationController.show(pinnedTask.topActivity.getPackageName());
@@ -326,6 +326,9 @@ public class TvPipController implements PipTransitionController.PipTransitionCal 


    @Override

    public void onPipTransitionFinished(int direction) {

        if (PipAnimationController.isInPipDirection(direction) && mState == STATE_NO_PIP) {

            setState(STATE_PIP);

        }

        if (DEBUG) Log.d(TAG, "onPipTransition_Finished(), state=" + stateToName(mState));

    }