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

Commit 6542140d authored by Alex Stetson's avatar Alex Stetson
Browse files

Add virtual display support for multi window mode 

Bug: 341151395
Test: atest GenericWindowPolicyControllerTest
Flags: aconfig android.companion.virtualdevice.flags.virtual_display_multi_window_mode_support
Change-Id: Ic1dd55ccee6aba7779425a09224a70f17cf8e4bc
parent 690fdd26

core/java/android/companion/virtual/flags/flags.aconfig

+12 −1
Original line number Diff line number Diff line
@@ -53,3 +53,14 @@ flag { 
    bug: "303535376"

    is_fixed_read_only: true

}



flag {

    namespace: "virtual_devices"

    name: "virtual_display_multi_window_mode_support"

    description: "Add support for WINDOWING_MODE_MULTI_WINDOW to virtual displays by default"

    is_fixed_read_only: true

    bug: "341151395"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

core/java/android/window/DisplayWindowPolicyController.java

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.app.WindowConfiguration;

import android.companion.virtualdevice.flags.Flags;

import android.content.ComponentName;

import android.content.Intent;

import android.content.pm.ActivityInfo;
@@ -66,6 +67,9 @@ public abstract class DisplayWindowPolicyController { 
    public DisplayWindowPolicyController() {

        synchronized (mSupportedWindowingModes) {

            mSupportedWindowingModes.add(WindowConfiguration.WINDOWING_MODE_FULLSCREEN);

            if (Flags.virtualDisplayMultiWindowModeSupport()) {

                mSupportedWindowingModes.add(WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW);

            }

        }

    }