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

Commit 7c7f6d3a authored by Kacper Kapłon's avatar Kacper Kapłon Committed by Android (Google) Code Review
Browse files

Merge changes Ib352d2d1,I2d392377 into main 

* changes:
  Add isInteractivePictureInPicture attribute to TaskInfo
  Add aconfig flag for Interactive Picture-in-Picture API.
parents 5391e220 0fb6c351

core/java/android/app/TaskInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -418,6 +418,12 @@ public class TaskInfo { 
    @Nullable

    public Rect topActivityMainWindowFrame;



    /**

     * Whether the Task should be an Interactive Picture-in-Picture window.

     * @hide

     */

    public boolean isInteractivePictureInPicture;



    TaskInfo() {

        // Do nothing

    }

core/java/android/window/DesktopExperienceFlags.java

+2 −2
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX),

    ENABLE_EMPTY_DESK_ON_MINIMIZE(Flags::enableEmptyDeskOnMinimize, true,

            Flags.FLAG_ENABLE_EMPTY_DESK_ON_MINIMIZE),

    ENABLE_EXCLUSIVE_FLOATING_WINDOW(Flags::enableExclusiveFloatingWindow, false,

            Flags.FLAG_ENABLE_EXCLUSIVE_FLOATING_WINDOW),

    ENABLE_FREEFORM_BOX_SHADOWS(Flags::enableFreeformBoxShadows, false,

            Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS),

    ENABLE_FREEFORM_DISPLAY_LAUNCH_PARAMS(Flags::enableFreeformDisplayLaunchParams, true,
@@ -163,6 +161,8 @@ public enum DesktopExperienceFlags { 
    ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP(

            Flags::enableInorderTransitionCallbacksForDesktop, false,

            Flags.FLAG_ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP),

    ENABLE_INTERACTIVE_PICTURE_IN_PICTURE(Flags::enableInteractivePictureInPicture, false,

            Flags.FLAG_ENABLE_INTERACTIVE_PICTURE_IN_PICTURE),

    ENABLE_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS(Flags::keyboardShortcutsToSwitchDesks, true,

            Flags.FLAG_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS),

    ENABLE_MIRROR_DISPLAY_NO_ACTIVITY(Flags::enableMirrorDisplayNoActivity, false,

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

+7 −7
Original line number Diff line number Diff line
@@ -806,13 +806,6 @@ flag { 
    }

}



flag {

    name: "enable_exclusive_floating_window"

    namespace: "lse_desktop_experience"

    description: "Enables the exclusive floating-on-top freeform window API."

    bug: "399376001"

}



flag {

    name: "enable_freeform_box_shadows"

    namespace: "lse_desktop_experience"
@@ -905,6 +898,13 @@ flag { 
    }

}



flag {

    name: "enable_interactive_picture_in_picture"

    namespace: "web_apps_on_chromeos_and_android"

    description: "Enables the Interactive Picture-in-Picture window API."

    bug: "399376001"

}



flag {

    name: "enable_key_gesture_handler_for_sysui"

    namespace: "lse_desktop_experience"