DO NOT MERGE - Merge Android 13main-16k

Bug: 242648940
Merged-In: I2b4893d7ac80df60b38c8b01bd8998b66c55fd0a
Change-Id: I204eea252e1eec499df1239c8bafa8bcb6e3093a

2 files changed, 36 insertions, 6 deletions

diff --git a/chromium.org/unstable/gaming-input/gaming-input-unstable-v2.xml b/chromium.org/unstable/gaming-input/gaming-input-unstable-v2.xml
index 3f9a74c..5e57e4a 100644
--- a/chromium.org/unstable/gaming-input/gaming-input-unstable-v2.xml
+++ b/chromium.org/unstable/gaming-input/gaming-input-unstable-v2.xml
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
   </copyright>
 
-  <interface name="zcr_gaming_input_v2" version="2">
+  <interface name="zcr_gaming_input_v2" version="3">
     <description summary="extends wl_seat with gaming input devices">
       A global interface to provide gaming input devices for a given seat.
 
@@ -98,7 +98,7 @@
     </event>
   </interface>
 
-  <interface name="zcr_gamepad_v2" version="2">
+  <interface name="zcr_gamepad_v2" version="3">
     <description summary="gamepad input device">
       The zcr_gamepad_v2 interface represents one or more gamepad input devices,
       which are reported as a normalized 'Standard Gamepad' as it is specified
@@ -204,6 +204,14 @@
       </description>
       <arg name="vibrator" type="new_id" interface="zcr_gamepad_vibrator_v2" summary="the gamepad vibrator"/>
     </event>
+
+    <!-- added since v3 -->
+    <event name="supported_key_bits" since="3">
+      <description summary="supported key bits">
+        Supported scan code key bits of the gamepad device.
+      </description>
+      <arg name="key_bits" type="array" summary="Uint64 key bits" />
+    </event>
   </interface>
 
   <interface name="zcr_gamepad_vibrator_v2" version="2">
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 622ebea..bcf1afb 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="1">
+  <interface name="zcr_remote_shell_v2" version="2">
     <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="1">
+  <interface name="zcr_remote_surface_v2" version="2">
     <description summary="A desktop window">
       An interface that may be implemented by a wl_surface, for
       implementations that provide a desktop-style user interface
@@ -736,7 +736,7 @@
 
     <request name="set_resize_lock" since="1">
       <description summary="set resize lock state">
-          Enable the resize lock and put restrictions related to resizing on
+          [Deprecated] Enable the resize lock and put restrictions related to resizing on
           the shell surface.
 
           The resize lock state is double buffered, and will be applied at the
@@ -746,7 +746,7 @@
 
     <request name="unset_resize_lock" since="1">
       <description summary="unset resize lock state">
-          Disable the resize lock and allow the shell surface to be resized
+          [Deprecated] Disable the resize lock and allow the shell surface to be resized
           freely.
 
           The resize lock state is double buffered, and will be applied at the
@@ -806,6 +806,28 @@
       <arg name="width" type="int"/>
       <arg name="height" type="int"/>
     </request>
+
+    <!-- Version 2 additions -->
+
+    <enum name="resize_lock_type">
+      <description summary="resize lock type">
+  Resize lock type that can be used to put restrictions related to resizing.
+      </description>
+      <entry name="none" value="0" summary="follows normal resizeable policies"/>
+      <entry name="resize_enabled_togglable" value="1" summary="resizing is enabled and resize lock type is togglable" />
+      <entry name="resize_disabled_togglable" value="2" summary="resizing is disabled and resize lock type is togglable" />
+      <entry name="resize_disalbed_nontoggleable" value="3" summary="resizing is disabled and resize lock type is not togglable"/>
+    </enum>
+
+    <request name="set_resize_lock_type" since="2">
+      <description summary="set resize lock type">
+  Set resize lock type and put restrictions related to resizing on the shell surface.
+
+  The resize lock type is double buffered, and will be applied at the
+  time wl_surface.commit of the corresponding wl_surface is called.
+      </description>
+      <arg name="type" type="uint" enum="resize_lock_type" summary="resize lock type"/>
+    </request>
   </interface>
 
   <interface name="zcr_notification_surface_v2" version="1">