Merge "Merge "Don't show caption menu for things in TaskView / bubbles" into udc-qpr-dev am: 67418d25e4" into udc-qpr-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
1b22d9a9aa
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user