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

Commit a21026f2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Don't show caption menu for things in TaskView / bubbles" into... 

Merge "Merge "Don't show caption menu for things in TaskView / bubbles" into udc-qpr-dev am: 67418d25" into udc-qpr-dev-plus-aosp am: 1b22d9a9

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



Change-Id: I67b60dc23c900f9d65acf3c679ff117d5f64c1bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f744938c 1b22d9a9

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

+1 −0
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        return DesktopModeStatus.isProto2Enabled()

                && taskInfo.getWindowingMode() != WINDOWING_MODE_PINNED

                && taskInfo.getActivityType() == ACTIVITY_TYPE_STANDARD

                && !taskInfo.configuration.windowConfiguration.isAlwaysOnTop()

                && mDisplayController.getDisplayContext(taskInfo.displayId)

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

    }