Merge "Move always-on-top to the callers" into rvc-dev am: 331cd1a9c9 am: 5b84b22e92

Change-Id: Idcefac2ae2abde8ff354e9bb26d43966e506bbda

core/java/android/window/VirtualDisplayTaskEmbedder.java

@@ -248,7 +248,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
         options = super.prepareActivityOptions(options);
         options.setLaunchDisplayId(getDisplayId());
         options.setLaunchWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
-        options.setTaskAlwaysOnTop(true);
         return options;
     }
 

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

@@ -125,6 +125,7 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
                     // Custom options so there is no activity transition animation
                     ActivityOptions options = ActivityOptions.makeCustomAnimation(getContext(),
                             0 /* enterResId */, 0 /* exitResId */);
+                    options.setTaskAlwaysOnTop(true);
                     // Post to keep the lifecycle normal
                     post(() -> {
                         if (DEBUG_BUBBLE_EXPANDED_VIEW) {