Fixed a problem which would cause mobile rebind sample build to run in portrait mode. Game manager now enforces landscape as part of running. Added menu button and reenabled UI actions during gameplay.

Author: ekcoh

Assets/Samples/RebindingUI/Game/GameplayManager.cs

@@ -191,6 +191,9 @@ internal bool TryTeleportOrthographicExtents(Vector3 position, out Vector3 resul
 
         private void Awake()
         {
+            // This game is designed for landscape orientation, so make sure we use it.
+            Screen.orientation = ScreenOrientation.LandscapeLeft;
+
             m_FeedbackController = GetComponent<FeedbackController>();
 
             m_EnemyPool = new ObjectPool<Enemy>(

Assets/Samples/RebindingUI/InputActionExtensions.cs

@@ -0,0 +1,24 @@
+using System;
+
+namespace UnityEngine.InputSystem.Samples.RebindUI
+{
+    /// <summary>
+    /// Extension methods to reduce code bloat of this example.
+    /// </summary>
+    public static class InputActionExtensions
+    {
+        /// <summary>
+        /// Attempts to find an action binding using its binding ID (GUID).
+        /// </summary>
+        /// <param name="action">The action instance, may be null.</param>
+        /// <param name="bindingId">The binding ID (GUID) represented by a string.</param>
+        /// <returns>Zero-based index of the binding or -1 if not found.</returns>
+        public static int FindBindingById(this InputAction action, string bindingId)
+        {
+            if (action == null || string.IsNullOrEmpty(bindingId))
+                return -1;
+            var id = new Guid(bindingId);
+            return action.bindings.IndexOf(x => x.id == id);
+        }
+    }
+}

Assets/Samples/RebindingUI/InputActionExtensions.cs.meta

@@ -129,15 +129,8 @@ public bool Refresh()
             return true;
         }
 
-        public static int FindBindingById(InputAction action, string bindingId)
-        {
-            if (action == null || string.IsNullOrEmpty(bindingId)) return -1;
-            var id = new Guid(bindingId);
-            return action.bindings.IndexOf(x => x.id == id);
-        }
-
         public string bindingId => m_BindingIdProperty.stringValue;
-        public int bindingIndex => FindBindingById(action, m_BindingIdProperty.stringValue);
+        public int bindingIndex => action.FindBindingById(m_BindingIdProperty.stringValue);
 
         public InputAction action => ((InputActionReference)m_ActionProperty.objectReferenceValue)?.action;
 

Assets/Samples/RebindingUI/RebindActionEditor.cs

@@ -124,7 +124,7 @@ private void SetParameterValue(float value)
             if (m_Action != null && m_Action.action != null)
             {
                 var action = m_Action.action;
-                int bindingIndex = BindingUI.FindBindingById(action, m_BindingId);
+                int bindingIndex = action.FindBindingById(m_BindingId);
                 var bindingMask = bindingIndex >= 0 ? action.bindings[bindingIndex] : default;
 
                 // We apply parameter override. This directly affects matching processors and interactions

Assets/Samples/RebindingUI/RebindActionParameterUI.cs

@@ -182,25 +182,15 @@ public InteractiveRebindEvent stopRebindEvent
         /// <returns>true if able to resolve, otherwise false.</returns>
         public bool ResolveActionAndBinding(out InputAction action, out int bindingIndex)
         {
-            bindingIndex = -1;
-
             action = m_Action?.action;
-            if (action == null)
-                return false;
 
-            if (string.IsNullOrEmpty(m_BindingId))
-                return false;
+            bindingIndex = action.FindBindingById(m_BindingId);
+            if (bindingIndex >= 0)
+                return true;
 
-            // Look up binding index.
-            var id = new Guid(m_BindingId);
-            bindingIndex = action.bindings.IndexOf(x => x.id == id);
-            if (bindingIndex == -1)
-            {
+            if (action != null && !string.IsNullOrEmpty(m_BindingId))
                 Debug.LogError($"Cannot find binding with ID '{m_BindingId}' on '{action}'", this);
-                return false;
-            }
-
-            return true;
+            return false;
         }
 
         /// <summary>