Merge branch 'develop' into performance/frame-time-test-trial

.github/pull_request_template.md

@@ -1,18 +1,22 @@
 ### Description
 
-_Please fill this section with a description what the pull request is trying to address._
+_Please fill this section with a description what the pull request is trying to address and what changes were made._
 
-### Changes made
 
-_Please write down a short description of what changes were made._
-
-### Testing
+### Testing status & QA
 
 _Please describe the testing already done by you and what testing you request/recommend QA to execute. If you used or created any testing project please link them here too for QA._
 
-### Risk
+### Overall Product Risks
+
+_Please rate the potential complexity and halo effect from low to high for the reviewers. Note down potential risks to specific Editor branches if any._
+
+- Complexity: 
+- Halo Effect: 
+
+### Comments to reviewers
 
-_Please describe the potential risks of your changes for the reviewers._
+_Please describe any additional information such as what to focus on, or historical info for the reviewers._
 
 ### Checklist
 

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.11.2
+//     version 1.11.3
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.11.2
+//     version 1.11.3
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.11.2
+//     version 1.11.3
 //     from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Tests/InputSystem/Plugins/UITests.cs

@@ -3876,8 +3876,8 @@ public IEnumerator UI_WhenCursorIsLockedToScreenCenter_PointerEnterAndExitEvents
 #if UNITY_2022_3_OR_NEWER // displayIndex is only available from 2022.3 onwards
 
     [UnityTest]
-#if UNITY_TVOS
-    [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]
+#if UNITY_TVOS || UNITY_ANDROID
+    [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]
 #endif
     public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnScreenSpaceCanvas()
     {
@@ -3927,9 +3927,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnScreenSpaceCanv
     }
 
     [UnityTest]
-#if UNITY_TVOS
-    [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]
-#else
+#if UNITY_TVOS || UNITY_ANDROID
+    [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]
 #endif
     public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas()
     {
@@ -3980,8 +3979,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas()
     }
 
     [UnityTest]
-#if UNITY_TVOS
-    [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]
+#if UNITY_TVOS || UNITY_ANDROID
+    [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]
 #endif
     public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnScreenSpaceCanvas()
     {
@@ -4032,6 +4031,9 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnScreenSpaceCanvas()
     }
 
     [UnityTest]
+#if UNITY_ANDROID
+    [Ignore("Failing on Android https://jira.unity3d.com/browse/ISX-2029")]
+#endif
     public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnOverlayCanvas()
     {
         // Setup the Test Scene
@@ -4082,8 +4084,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnOverlayCanvas()
     }
 
     [UnityTest]
-#if UNITY_TVOS
-    [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]
+#if UNITY_TVOS || UNITY_ANDROID
+    [Ignore("Failing on TVOS & Android https://jira.unity3d.com/browse/ISX-2029")]
 #endif
     public IEnumerator UI_DisplayIndexMatchesDisplayMultiplePointers()
     {