From 261451644c3d923f1ae959801ee32900704cb1d0 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Mon, 10 Jul 2023 11:01:11 -0700
Subject: [PATCH] Don't show caption menu for things in TaskView / bubbles

Test: manual - enable desktop windowing
             - get a bubble and expand it, verify there isn't an
               extra handle at the top of the view
Bug: 287090311
Change-Id: I0b382cd6ec529ad2264aec1b633b99817c6a7b18
---
 .../wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
index 14f2f9b9fcf57..1a18fc2d75464 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
@@ -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;
     }