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

Commit 5db8667f authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Android (Google) Code Review
Browse files

Merge "[PiP on CD] Update CD PiP flag callers to use DesktopExperienceFlags." into main

parents 6246f311 52182561

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

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; 
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;



import android.app.ActivityManager;

import android.window.DesktopExperienceFlags;

import android.window.DisplayAreaInfo;

import android.window.WindowContainerToken;

import android.window.WindowContainerTransaction;
@@ -67,7 +68,7 @@ public class PipDesktopState { 


    /** Returns whether PiP in Connected Displays is enabled by checking the flag. */

    public boolean isConnectedDisplaysPipEnabled() {

        return Flags.enableConnectedDisplaysPip();

        return DesktopExperienceFlags.ENABLE_CONNECTED_DISPLAYS_PIP.isTrue();

    }



    /** Returns whether the display with the PiP task is in freeform windowing mode. */

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java

+4 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.res.Configuration; 
import android.graphics.Rect;

import android.os.Bundle;

import android.view.SurfaceControl;

import android.window.DesktopExperienceFlags;

import android.window.DisplayAreaInfo;

import android.window.WindowContainerTransaction;
@@ -41,7 +42,6 @@ import androidx.annotation.Nullable; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.ProtoLog;

import com.android.internal.util.Preconditions;

import com.android.window.flags.Flags;

import com.android.wm.shell.R;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.common.DisplayChangeController;
@@ -303,7 +303,8 @@ public class PipController implements ConfigurationChangeListener, 
    public void onDisplayRemoved(int displayId) {

        // If PiP was active on an external display that is removed, clean up states and set

        // {@link PipDisplayLayoutState} to DEFAULT_DISPLAY.

        if (Flags.enableConnectedDisplaysPip() && mPipTransitionState.isInPip()

        if (DesktopExperienceFlags.ENABLE_CONNECTED_DISPLAYS_PIP.isTrue()

                && mPipTransitionState.isInPip()

                && displayId == mPipDisplayLayoutState.getDisplayId()

                && displayId != DEFAULT_DISPLAY) {

            mPipTransitionState.setState(PipTransitionState.EXITING_PIP);
@@ -385,7 +386,7 @@ public class PipController implements ConfigurationChangeListener, 


        // If PiP is enabled on Connected Displays, update PipDisplayLayoutState to have the correct

        // display info that PiP is entering in.

        if (Flags.enableConnectedDisplaysPip()) {

        if (DesktopExperienceFlags.ENABLE_CONNECTED_DISPLAYS_PIP.isTrue()) {

            final DisplayLayout displayLayout = mDisplayController.getDisplayLayout(displayId);

            if (displayLayout != null) {

                mPipDisplayLayoutState.setDisplayId(displayId);