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

Commit 36ee5cf5 authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c37 

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

Change-Id: I26298bb586092b951a6612caac6c0c7a44b777b5
parents 7ce164e0 d0125c37

packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,12 +81,12 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio 
    private InputConsumerController mInputConsumerController;

    private InputConsumerController mInputConsumerController;

    private PipMediaController mMediaController;

    private PipMediaController mMediaController;

    private PipTouchHandler mTouchHandler;

    private PipTouchHandler mTouchHandler;

    private PipTaskOrganizer mPipTaskOrganizer;

    private PipAppOpsListener mAppOpsListener;

    private PipAppOpsListener mAppOpsListener;

    private IPinnedStackAnimationListener mPinnedStackAnimationRecentsListener;

    private IPinnedStackAnimationListener mPinnedStackAnimationRecentsListener;

    private boolean mIsInFixedRotation;

    private boolean mIsInFixedRotation;





    protected PipMenuActivityController mMenuController;

    protected PipMenuActivityController mMenuController;

    protected PipTaskOrganizer mPipTaskOrganizer;





    /**

    /**

     * Handler for display rotation changes.

     * Handler for display rotation changes.