Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e05d56c5 authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Automerger Merge Worker
Browse files

Merge "Move multi window mode to the caller." into rvc-dev am: 8ecd6a37 am:... 

Merge "Move multi window mode to the caller." into rvc-dev am: 8ecd6a37 am: ece18494 am: 575d3401 am: 47e8be73

Change-Id: I3dc6714721f0d11e926df2566c8c714eddc2281d
parents d04739e3 47e8be73

core/java/android/window/VirtualDisplayTaskEmbedder.java

+0 −2
Original line number Diff line number Diff line
@@ -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;

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -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) {