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

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

Merge "Fix tv.PipController constructor"

parents fe431608 898168cb
Loading
Loading
Loading
Loading
+41 −44
Original line number Diff line number Diff line
@@ -106,10 +106,11 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac

    private int mSuspendPipResizingReason;

    private Context mContext;
    private PipBoundsState mPipBoundsState;
    private PipBoundsHandler mPipBoundsHandler;
    private PipTaskOrganizer mPipTaskOrganizer;
    private final Context mContext;
    private final PipBoundsState mPipBoundsState;
    private final PipBoundsHandler mPipBoundsHandler;
    private final PipTaskOrganizer mPipTaskOrganizer;

    private IActivityTaskManager mActivityTaskManager;
    private MediaSessionManager mMediaSessionManager;
    private int mState = STATE_NO_PIP;
@@ -121,7 +122,6 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
    private Rect mDefaultPipBounds = new Rect();
    private Rect mMenuModePipBounds;
    private int mLastOrientation = Configuration.ORIENTATION_UNDEFINED;
    private boolean mInitialized;
    private int mPipTaskId = TASK_ID_NO_PIP;
    private int mPinnedStackId = INVALID_STACK_ID;
    private ComponentName mPipComponentName;
@@ -234,8 +234,6 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
            PipTaskOrganizer pipTaskOrganizer,
            WindowManagerShellWrapper windowManagerShellWrapper
    ) {
        if (!mInitialized) {
            mInitialized = true;
        mContext = context;
        mPipBoundsState = pipBoundsState;
        mPipNotification = new PipNotification(context, this);
@@ -274,7 +272,6 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
        // TODO(b/169395392) Refactor PipMenuActivity to PipMenuView
        PipMenuActivity.setPipController(this);
    }
    }

    private void loadConfigurationsAndApply(Configuration newConfig) {
        if (mLastOrientation != newConfig.orientation) {