Merge "Move setTaskAlwaysOnTop from TaskView to BubbleExpandedView."

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);
     }
 
     /**

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

@@ -140,6 +140,7 @@ public class BubbleExpandedView extends LinearLayout {
                             + getBubbleKey());
                 }
                 try {
+                    options.setTaskAlwaysOnTop(true);
                     if (!mIsOverflow && mBubble.hasMetadataShortcutId()) {
                         options.setApplyActivityFlagsForBubbles(true);
                         mTaskView.startShortcutActivity(mBubble.getShortcutInfo(),

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