Merge "Don't show caption menu for things in TaskView / bubbles" into udc-qpr-dev

This commit is contained in:
Mady Mellor
2023-07-10 21:44:26 +00:00
committed by Android (Google) Code Review

View File

@@ -799,6 +799,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
return DesktopModeStatus.isProto2Enabled() return DesktopModeStatus.isProto2Enabled()
&& taskInfo.getWindowingMode() != WINDOWING_MODE_PINNED && taskInfo.getWindowingMode() != WINDOWING_MODE_PINNED
&& taskInfo.getActivityType() == ACTIVITY_TYPE_STANDARD && taskInfo.getActivityType() == ACTIVITY_TYPE_STANDARD
&& !taskInfo.configuration.windowConfiguration.isAlwaysOnTop()
&& mDisplayController.getDisplayContext(taskInfo.displayId) && mDisplayController.getDisplayContext(taskInfo.displayId)
.getResources().getConfiguration().smallestScreenWidthDp >= 600; .getResources().getConfiguration().smallestScreenWidthDp >= 600;
} }