From 06200523a1923c175d99561d4d767fc83f6e61b6 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 31 Mar 2020 22:47:02 -0700 Subject: [PATCH] Move always-on-top to the callers - This was accidentally included in ag/10788780, where only the bubbles AV should be using an always-on-top MW task Bug: 152808872 Test: Start auto in emulator and ensure the task is not always on top Change-Id: If0de9d5856b15dbca7661bf97a88b10fd63ec9db --- core/java/android/window/VirtualDisplayTaskEmbedder.java | 1 - .../src/com/android/systemui/bubbles/BubbleExpandedView.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/window/VirtualDisplayTaskEmbedder.java b/core/java/android/window/VirtualDisplayTaskEmbedder.java index 0b2dcd8b3a924..1afbfeb96fc3e 100644 --- a/core/java/android/window/VirtualDisplayTaskEmbedder.java +++ b/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; } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java index 5c66462f2a5be..496456decceec 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java +++ b/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) {