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

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

Change-Id: I67b60dc23c900f9d65acf3c679ff117d5f64c1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2023-07-10 22:26:35 +00:00

View File

@@ -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;
}