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

Commit 60b4156d authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Do not show window decor for PIP" into udc-qpr-dev

parents cfb10296 8d20824d

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

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

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;



import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT;
@@ -814,6 +815,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            return false;

        }

        return DesktopModeStatus.isProto2Enabled()

                && taskInfo.getWindowingMode() != WINDOWING_MODE_PINNED

                && taskInfo.getActivityType() == ACTIVITY_TYPE_STANDARD

                && mDisplayController.getDisplayContext(taskInfo.displayId)

                .getResources().getConfiguration().smallestScreenWidthDp >= 600;