Snap for 10843824 from a31dd3553ef8c2fd87f24dfa7fda78b17fb829f3 to 24Q1-release

Change-Id: I3c7bf5fe573f816f99ce4ebe3f410546ea67cae1

3 files changed, 212 insertions, 8 deletions

diff --git a/chromium.org/unstable/aura-shell/aura-shell.xml b/chromium.org/unstable/aura-shell/aura-shell.xml
index e234b34..2d3ea86 100644
--- a/chromium.org/unstable/aura-shell/aura-shell.xml
+++ b/chromium.org/unstable/aura-shell/aura-shell.xml
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
   </copyright>
 
-  <interface name="zaura_shell" version="54">
+  <interface name="zaura_shell" version="61">
     <description summary="aura_shell">
       The global interface exposing aura shell capabilities is used to
       instantiate an interface extension for a wl_surface object.
@@ -158,6 +158,47 @@
   renamed to "destroy" if we move to aura-shell v2.
       </description>
     </request>
+
+    <!-- Version 57 additions -->
+    <event name="set_overview_mode" since="57">
+      <description summary="entered overview mode">
+        Notifies client that the server has entered overview mode. Overview mode
+        displays all app windows associated with the current desk for the user.
+      </description>
+    </event>
+    <event name="unset_overview_mode" since="57">
+      <description summary="exited overview mode">
+        Notifies client that the server has exited overview mode.
+      </description>
+    </event>
+
+    <!-- Version 58 additions -->
+    <event name="compositor_version" since="58">
+      <description summary="sends the server version">
+        Sends the Exo compositor version information.
+      </description>
+      <arg name="version_label" type="string" summary="version string label"/>
+    </event>
+
+    <!-- Version 60 additions -->
+    <event name="all_bug_fixes_sent" since="60">
+      <description summary="completed sending all bug fix ids">
+        Notifies client that all the IDs of a bug fixed on the exo server is
+        sent. Bug fix ids are sent via `bug_fix` events which sends ids one by
+        one, not an array. This event is used to confirm all ids are sent.
+      </description>
+    </event>
+
+    <!-- Version 61 additions -->
+    <event name="window_corners_radii" since="61">
+      <description summary="sends the radius of each corner the window">
+        Sends the radius of each corner of the window to the clients in dips.
+      </description>
+      <arg name="upper_left_radius" type="uint"/>
+      <arg name="upper_right_radius" type="uint"/>
+      <arg name="lower_right_radius" type="uint"/>
+      <arg name="lower_left_radius" type="uint"/>
+    </event>
   </interface>
 
   <interface name="zaura_surface" version="51">
@@ -764,7 +805,7 @@
     </event>
   </interface>
 
-  <interface name="zaura_toplevel" version="54">
+  <interface name="zaura_toplevel" version="60">
     <description summary="aura shell interface to the toplevel shell">
       An interface to the toplevel shell, which allows the
       client to access shell specific functionality.
@@ -962,6 +1003,7 @@
     <!-- Version 39 additions -->
     <request name="set_float" since="39">
       <description summary="float the surface on top">
+        [Deprecated] Use set_float_to_location.
         This is a request to place the surface above others.
       </description>
     </request>
@@ -1156,6 +1198,150 @@
       </description>
       <arg name="region" type="object" interface="wl_region" allow-null="true"/>
     </request>
+
+    <request name="set_top_inset" since="55">
+      <description summary="set top inset to the surface">
+        Sets the top inset to the surface. This represents the header height
+        and should be non negative.
+      </description>
+      <arg name="height" type="int" summary="Top inset of client window. Should be non negative."/>
+    </request>
+
+    <!-- Version 56 additions -->
+    <enum name="rotate_direction">
+      <entry name="backward" value="0" />
+      <entry name="forward" value="1" />
+    </enum>
+
+    <enum name="rotate_restart_state">
+      <entry name="no_restart" value="0" />
+      <entry name="restart" value="1" />
+    </enum>
+
+    <event name="rotate_focus" since="56">
+      <description summary="rotate focus within window">
+        Rotates focus within the toplevel window. The window must sort its
+        focusable view into a stable and linearly traversable order. Prior to
+        rotating focus, the surface should already be activated and have
+        keyboard focus. If the surface has not been activated or does not have
+        keyboard focus, the server should first activate and enter keyboard
+        focus for the window. An example of event order could be:
+
+        1. activate surface
+        2. enter keyboard focus
+        3. rotate focus
+
+        If the window is not activated or does not have keyboard focus, the
+        client should respond with a "not handled" and not perform any
+        operation.
+
+        To start a new series rotation, the server will set the "restart" arg
+        to true. If the "restart" arg is set to true, the window should set the
+        focus on the first UI element for the given direction and not perform
+        any rotation.
+
+        The client should respond with whether the rotation was successful via
+        the "handled" field in the "ack_rotate_focus" request. The client should
+        pass on the event serial and direction within the ack message.
+      </description>
+      <arg name="serial" type="uint" summary="serial for the rotation event" />
+      <arg name="direction" type="uint" enum="rotate_direction" summary="the direction for linear traversal" />
+      <arg name="restart" type="uint" enum="rotate_restart_state" summary="whether or not to restart traversal" />
+    </event>
+
+    <enum name="rotate_handled_state">
+      <entry name="not_handled" value="0" />
+      <entry name="handled" value="1" />
+    </enum>
+
+    <request name="ack_rotate_focus" since="56">
+      <description summary="status of rotate focus event">
+        If the focus has been successfully rotated between UI elements inside
+        surface, client replies with 'handled'. If the focus didn't rotate, the
+        client reply with 'not_handled'. A server may use this to move the focus
+        to next focusable surface.
+
+        Note that a delay in processing in the client could result in stale acks
+        received by the server.
+      </description>
+      <arg name="serial" type="uint" summary="serial for the original; rotation event" />
+      <arg name="handled" type="uint" enum="rotate_handled_state" summary="whether or not the rotation was successful" />
+    </request>
+
+    <request name="set_can_maximize" since="58">
+      <description summary="Hint that the toplevel surface can be maximized">
+        Hints to the window manager that the toplevel surface can be maximized.
+      </description>
+    </request>
+
+    <request name="unset_can_maximize" since="58">
+      <description summary="Hint that the toplevel surface should not be maximized">
+        Hints to the window manager that the toplevel surface should not be
+        maximized. Note that the window manager might still request the client
+        to be maximized. In such an event, the client should respect the
+        window manager's request and maximize. It may unset the maximized state
+        afterwards.
+      </description>
+    </request>
+
+    <request name="set_can_fullscreen" since="58">
+      <description summary="Hint that the toplevel surface can enter fullscreen">
+        Hints to the window manager that the toplevel surface can enter
+        fullscreen.
+      </description>
+    </request>
+
+    <request name="unset_can_fullscreen" since="58">
+      <description summary="Hint that the toplevel surface should not enter fullscreen">
+        Hints to the window manager that the toplevel surface should not be
+        enter fullscreen. Note that the window manager might still request the
+        client enter fullscreen. In such an event, the client should respect the
+        window manager's request and enter fullscreen. It may exit fullscreen
+        afterwards.
+      </description>
+    </request>
+
+    <!-- Version 59 additions -->
+    <enum name="float_start_location">
+      <description
+        summary="Specifies the location of a surface that just got floated.">
+          Possible start locations if a surface gets floated.
+      </description>
+       <entry
+        name="bottom_right"
+        value="0"
+        summary="On float, surface goes to the bottom right of the work area. This is the default."/>
+      <entry
+        name="bottom_left"
+        value="1"
+        summary="On float, surface goes to the bottom left of the work area."/>
+    </enum>
+    <request name="set_float_to_location" since="59">
+      <description summary="float the surface on top">
+        This is a request to place the surface above others.
+      </description>
+      <arg name="mode" type="uint" enum="float_start_location"/>
+    </request>
+
+    <!-- Version 60 additions -->
+    <request name="set_window_corner_radii" since="60">
+      <description summary="Request to apply rounded corners to the window of the surface.">
+        The client specifies the radius of each corner to be applied to the
+        window in DPs (device independent pixels).
+
+        The window radius is double buffered, and will be applied at the
+        time wl_surface.commit of the corresponding wl_surface is called.
+
+        Note: Rounded corner radii affects the wl_surface tree, including
+        subsurfaces. Once this protocol is called, surfaces cannot set
+        their own rounded corner bounds because rounded window bounds will be
+        applied to the whole surface tree.
+      </description>
+      <arg name="upper_left_radius" type="uint"/>
+      <arg name="upper_right_radius" type="uint"/>
+      <arg name="lower_right_radius" type="uint"/>
+      <arg name="lower_left_radius" type="uint"/>
+    </request>
   </interface>
 
   <interface name="zaura_popup" version="46">
diff --git a/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml b/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml
index 0ca2270..dec0247 100644
--- a/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml
+++ b/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml
@@ -38,7 +38,7 @@
     reset.
   </description>
 
-  <interface name="zcr_remote_shell_v2" version="4">
+  <interface name="zcr_remote_shell_v2" version="5">
     <description summary="remote_shell">
       The global interface that allows clients to turn a wl_surface into a
       "real window" which is remotely managed but can be stacked, activated
@@ -162,7 +162,7 @@
 
   </interface>
 
-  <interface name="zcr_remote_surface_v2" version="4">
+  <interface name="zcr_remote_surface_v2" version="5">
     <description summary="A desktop window">
       An interface that may be implemented by a wl_surface, for
       implementations that provide a desktop-style user interface
@@ -849,13 +849,31 @@
         float. This is because wayland does not support native transport of
         floats. As different CPU architectures may use different endian
         representations for IEEE 754 floats, this protocol implicitly assumes
-        that the caller and receiver are the same machine. To avoid redundant
-        messages, this request needs to only be called once when the zaura
-        toplevel scale factor changes.
+        that the caller and receiver are the same machine.
         This is double buffered state and will be applied in the next commit.
       </description>
       <arg name="scale_factor_as_uint" type="uint"/>
     </request>
+
+     <!-- Version 5 additions -->
+    <request name="set_window_corner_radii" since="5">
+      <description summary="Request to apply rounded corners to the window of the surface.">
+        The client specifies the radius of each corner to be applied to the
+        window in DPs (device independent pixels).
+
+        The window radius is double buffered, and will be applied at the
+        time wl_surface.commit of the corresponding wl_surface is called.
+
+        Note: Rounded corner radii affects the wl_surface tree, including
+        subsurfaces. Once this protocol is called, surfaces cannot set
+        their own rounded corner bounds because rounded window bounds will be
+        applied to the whole surface tree.
+      </description>
+      <arg name="upper_left_radius" type="uint"/>
+      <arg name="upper_right_radius" type="uint"/>
+      <arg name="lower_right_radius" type="uint"/>
+      <arg name="lower_left_radius" type="uint"/>
+    </request>
   </interface>
 
   <interface name="zcr_notification_surface_v2" version="1">
diff --git a/wayland_protocol_codegen.go b/wayland_protocol_codegen.go
index bf7a9af..0711ac7 100644
--- a/wayland_protocol_codegen.go
+++ b/wayland_protocol_codegen.go
@@ -920,7 +920,7 @@ type bazelGensrcsAttributes struct {
 }
 
 // ConvertWithBp2build converts a Soong module -> Bazel target.
-func (m *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
+func (m *Module) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) {
 	// Bazel only has the "tools" attribute.
 	tools_prop := android.BazelLabelForModuleDeps(ctx, m.properties.Tools)
 	tool_files_prop := android.BazelLabelForModuleSrc(ctx, m.properties.Tool_files)