Apply changes based on review

Author: jfreire-unity

Assets/Tests/InputSystem/Plugins/UITests.cs

@@ -1720,7 +1720,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         scene.leftChildReceiver.events.Clear();
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.False);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.False);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.False);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.False);
 
@@ -1733,7 +1732,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         var pointerIdTouch2 = ExtendedPointerEventData.MakePointerIdForTouch(touchScreen.deviceId, 2);
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.True);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.False);
 
@@ -1763,7 +1761,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         yield return null;
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.True);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.True);
 
@@ -1799,7 +1796,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         yield return null;
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.True);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.True);
 
@@ -1826,7 +1822,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         yield return null;
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.False);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.False);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.False);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.False);
 

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -11,18 +11,18 @@ however, it has to be formatted properly to pass verification tests.
 ## [Unreleased] - yyyy-mm-dd
 
 ### Fixed
-- Fixed an issue causing the Action context menu to not show on right click when right clicking an action in the Input Action Editor [ISXB-1134](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1134).
+- Fixed an issue causing the Action context menu to not show on right click when right clicking an action in the Input Action Editor. [ISXB-1134](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1134).
+- Fixed pointerId staying the same when simultaneously releasing and then pressing in the same frame on mobile using touch. [ISXB-1006](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-845)
 
 ## [1.11.2] - 2024-10-16
 
 ### Fixed
 - Fixed touch pointers being released twice causing an index out of bounds error. [ISXB-687](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-687)
 - Fixed `NullReferenceException` from disconnecting and reconnecting a GXDKGamepad.
 - Fixed wrong mapping of Xbox Series S|X and Xbox One wireless controllers "View" button on macOS.[ISXB-385](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-385)
-- Fixed "AnalyticsResult" errors on consoles [ISXB-1107]
+- Fixed "AnalyticsResult" errors on consoles. [ISXB-1107]
 - Fixed wrong `Display Index` value for touchscreen events.[ISXB-1101](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1101)
-- Fixed event handling when using Fixed Update processing where WasPressedThisFrame could appear to true for consecutive frames [ISXB-1006](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1006)
-- Fixed pointerId staying the same when simultaneously releasing and then pressing in the same frame on mobile using touch [ISXB-1006](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-845)
+- Fixed event handling when using Fixed Update processing where WasPressedThisFrame could appear to true for consecutive frames. [ISXB-1006](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1006)
 
 ### Added
 - Added the display of the device flag `CanRunInBackground` in device debug view.
@@ -32,7 +32,7 @@ however, it has to be formatted properly to pass verification tests.
 - Removed a redundant warning when using fallback code to parse a HID descriptor. (UUM-71260)
 
 ### Changed
-- Removed the InputManager to InputSystem project-wide asset migration code for performance improvement (ISX-2086)
+- Removed the InputManager to InputSystem project-wide asset migration code for performance improvement. (ISX-2086)
 
 ## [1.11.1] - 2024-09-26
 

Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs

@@ -1746,8 +1746,7 @@ private int GetPointerStateIndexFor(InputControl control, bool createIfNotExists
                 ref var pointerState = ref GetPointerStateForIndex(touchControlIndex);
 
                 if (!(pointerTouchControl is TouchControl) ||
-                    (pointerTouchControl is TouchControl &&
-                     pointerState.eventData.touchId == ((TouchControl)pointerTouchControl).touchId.value))
+                    (pointerState.eventData.touchId == ((TouchControl)pointerTouchControl).touchId.value))
                 {
                     // For touches, we cache a reference to the control of a pointer so that we don't
                     // have to continuously do ReadValue() on the touch ID control.