From 4664023109ec8e25c2db22e9e956bf56c64338bd Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Fri, 22 Jan 2021 13:38:16 -0800
Subject: [PATCH] Move setTaskAlwaysOnTop from TaskView to BubbleExpandedView.

Bug: 178212126
Bug: 175918200
Test: [Car] launch Dialer and check Dialer button is highlighted.
Test: [Phone] launch DetailDialog and check Navigation bar.
Change-Id: Ic10dca7e25a8828f8da36130ec78d2e24c765609
---
 libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java  | 1 -
 .../src/com/android/wm/shell/bubbles/BubbleExpandedView.java     | 1 +
 .../tests/unittest/src/com/android/wm/shell/TaskViewTest.java    | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java
index dd4313957f206..1df2a4a9030de 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java
@@ -157,7 +157,6 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback,
         });
         options.setLaunchCookie(launchCookie);
         options.setLaunchWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
-        options.setTaskAlwaysOnTop(true);
     }
 
     /**
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java
index cb6b54321b5e3..c4822f502f4f8 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java
@@ -137,6 +137,7 @@ public class BubbleExpandedView extends LinearLayout {
                             + getBubbleKey());
                 }
                 try {
+                    options.setTaskAlwaysOnTop(true);
                     if (!mIsOverflow && mBubble.hasMetadataShortcutId()) {
                         options.setApplyActivityFlagsForBubbles(true);
                         mTaskView.startShortcutActivity(mBubble.getShortcutInfo(),
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TaskViewTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TaskViewTest.java
index eb03ab0a98020..4e582c2420949 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TaskViewTest.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TaskViewTest.java
@@ -129,7 +129,6 @@ public class TaskViewTest extends ShellTestCase {
 
         verify(mOrganizer).setPendingLaunchCookieListener(any(), eq(mTaskView));
         assertThat(options.getLaunchWindowingMode()).isEqualTo(WINDOWING_MODE_MULTI_WINDOW);
-        assertThat(options.getTaskAlwaysOnTop()).isTrue();
     }
 
     @Test