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

Commit 83bb48eb authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Cleaning up com.android.window.flags.supports_multi_instance_system_ui flag" into main

parents 48e329a3 4d23daf5

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -56464,7 +56464,7 @@ package android.view { 
    field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE";

    field public static final String PROPERTY_COMPAT_ENABLE_FAKE_FOCUS = "android.window.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS";

    field public static final String PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION = "android.window.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION";

    field @FlaggedApi("com.android.window.flags.supports_multi_instance_system_ui") public static final String PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI = "android.window.PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI";

    field public static final String PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI = "android.window.PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI";

    field @FlaggedApi("com.android.window.flags.screen_recording_callbacks") public static final int SCREEN_RECORDING_STATE_NOT_VISIBLE = 0; // 0x0

    field @FlaggedApi("com.android.window.flags.screen_recording_callbacks") public static final int SCREEN_RECORDING_STATE_VISIBLE = 1; // 0x1

  }

core/java/android/view/WindowManager.java

+0 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,6 @@ public interface WindowManager extends ViewManager { 
     * </activity>

     * </pre>

     */

    @FlaggedApi(Flags.FLAG_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI)

    public static final String PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI =

            "android.window.PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI";

core/java/android/window/flags/windowing_frontend.aconfig

+0 −9
Original line number Diff line number Diff line
@@ -103,15 +103,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "supports_multi_instance_system_ui"

    is_exported: true

    namespace: "multitasking"

    description: "Feature flag to enable a multi-instance system ui component property."

    bug: "262864589"

    is_fixed_read_only: true

}



flag {

    name: "supports_drag_assistant_to_multiwindow"

    is_exported: true

libs/WindowManager/Shell/src/com/android/wm/shell/common/MultiInstanceHelper.kt

+1 −7
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ class MultiInstanceHelper @JvmOverloads constructor( 
    private val staticAppsSupportingMultiInstance: Array<String> = context.resources

            .getStringArray(R.array.config_appsSupportMultiInstancesSplit),

    shellInit: ShellInit,

    private val shellCommandHandler: ShellCommandHandler,

    private val supportsMultiInstanceProperty: Boolean

    private val shellCommandHandler: ShellCommandHandler

) : ShellCommandHandler.ShellCommandActionHandler {



    init {
@@ -72,11 +71,6 @@ class MultiInstanceHelper @JvmOverloads constructor( 
            }

        }



        if (!supportsMultiInstanceProperty) {

            // If not checking the multi-instance properties, then return early

            return false

        }



        // Check the activity property first

        try {

            val activityProp = packageManager.getPropertyAsUser(

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ public abstract class WMShellBaseModule { 
            ShellCommandHandler shellCommandHandler

    ) {

        return new MultiInstanceHelper(context, context.getPackageManager(),

                shellInit, shellCommandHandler, Flags.supportsMultiInstanceSystemUi());

                shellInit, shellCommandHandler);

    }



    //