diff options
| author | 2020-04-09 16:06:01 +0000 | |
|---|---|---|
| committer | 2020-04-09 16:06:01 +0000 | |
| commit | 8ecd6a377b1a2f3cecda831bc6b403608c8a0e11 (patch) | |
| tree | 4368dafddd5dbf77ea4ace493a78b3a61f9c6da8 | |
| parent | 1f1b416da9fdb909b7957cfc90713d907528637e (diff) | |
| parent | 5d62e755600754e83f33085327e7b4a5d23bcc10 (diff) | |
Merge "Move multi window mode to the caller." into rvc-dev
| -rw-r--r-- | core/java/android/window/VirtualDisplayTaskEmbedder.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/window/VirtualDisplayTaskEmbedder.java b/core/java/android/window/VirtualDisplayTaskEmbedder.java index 1afbfeb96fc3..0f26d5d00f6d 100644 --- a/core/java/android/window/VirtualDisplayTaskEmbedder.java +++ b/core/java/android/window/VirtualDisplayTaskEmbedder.java @@ -16,7 +16,6 @@ package android.window; -import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL; import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY; import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC; @@ -247,7 +246,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder { protected ActivityOptions prepareActivityOptions(ActivityOptions options) { options = super.prepareActivityOptions(options); options.setLaunchDisplayId(getDisplayId()); - options.setLaunchWindowingMode(WINDOWING_MODE_MULTI_WINDOW); 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 496456deccee..93fb6972fad5 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java @@ -16,6 +16,7 @@ package com.android.systemui.bubbles; +import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT; import static android.view.Display.INVALID_DISPLAY; @@ -126,6 +127,7 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList ActivityOptions options = ActivityOptions.makeCustomAnimation(getContext(), 0 /* enterResId */, 0 /* exitResId */); options.setTaskAlwaysOnTop(true); + options.setLaunchWindowingMode(WINDOWING_MODE_MULTI_WINDOW); // Post to keep the lifecycle normal post(() -> { if (DEBUG_BUBBLE_EXPANDED_VIEW) { |