Add more conflict fixes that were missed in the merge commit

Author: jfreire-unity

Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs

@@ -13,33 +13,35 @@ internal class HoldInteractionEditor : InputParameterEditor<HoldInteraction>
     {
         protected override void OnEnable()
         {
-            m_PressPointSetting.Initialize("Press Point",
-                "Float value that an axis control has to cross for it to be considered pressed.",
-                "Default Button Press Point",
-                () => target.pressPoint, v => target.pressPoint = v, () => ButtonControl.s_GlobalDefaultButtonPressPoint);
             m_DurationSetting.Initialize("Hold Time",
                 "Time (in seconds) that a control has to be held in order for it to register as a hold.",
                 "Default Hold Time",
                 () => target.duration, x => target.duration = x, () => InputSystem.settings.defaultHoldTime);
+            m_PressPointSetting.Initialize("Press Point",
+                "Float value that an axis control has to cross for it to be considered pressed.",
+                "Default Button Press Point",
+                () => target.pressPoint, v => target.pressPoint = v, () => ButtonControl.s_GlobalDefaultButtonPressPoint);
         }
 
         public override void OnGUI()
         {
             if (!InputSystem.settings.useIMGUIEditorForAssets)
                 return;
 
-            m_PressPointSetting.OnGUI();
             m_DurationSetting.OnGUI();
+            m_PressPointSetting.OnGUI();
         }
 
         public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
         {
-            m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);
             m_DurationSetting.OnDrawVisualElements(root, onChangedCallback);
+            m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);
+            CustomOrDefaultSetting.AddSharedDefaultSettingsFooter(root,
+                new[] { m_PressPointSetting, m_DurationSetting });
         }
 
-        private CustomOrDefaultSetting m_PressPointSetting;
         private CustomOrDefaultSetting m_DurationSetting;
+        private CustomOrDefaultSetting m_PressPointSetting;
     }
     #endif
 }

Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs

@@ -58,6 +58,8 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
             m_TapDelaySetting.OnDrawVisualElements(root, onChangedCallback);
             m_TapTimeSetting.OnDrawVisualElements(root, onChangedCallback);
             m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);
+            CustomOrDefaultSetting.AddSharedDefaultSettingsFooter(root,
+                new[] { m_TapTimeSetting, m_TapDelaySetting, m_PressPointSetting });
         }
 
         private readonly GUIContent m_TapCountLabel = new GUIContent("Tap Count", "How many taps need to be performed in succession. Two means double-tap, three means triple-tap, and so on.");

Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs

@@ -48,6 +48,8 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
             root.Add(behaviourDropdown);
 
             m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);
+            CustomOrDefaultSetting.AddSharedDefaultSettingsFooter(root,
+                new[] { m_PressPointSetting });
         }
 
         private CustomOrDefaultSetting m_PressPointSetting;

Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs

@@ -34,6 +34,8 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
         {
             m_DurationSetting.OnDrawVisualElements(root, onChangedCallback);
             m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);
+            CustomOrDefaultSetting.AddSharedDefaultSettingsFooter(root,
+                new[] { m_DurationSetting, m_PressPointSetting });
         }
 
         private CustomOrDefaultSetting m_DurationSetting;

Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs

@@ -34,6 +34,8 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
         {
             m_DurationSetting.OnDrawVisualElements(root, onChangedCallback);
             m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);
+            CustomOrDefaultSetting.AddSharedDefaultSettingsFooter(root,
+                new[] { m_DurationSetting, m_PressPointSetting });
         }
 
         private CustomOrDefaultSetting m_DurationSetting;

Packages/com.unity.inputsystem/Editor/Controls/Processors/AxisDeadzoneProcessorEditor.cs

@@ -34,6 +34,8 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
         {
             m_MinSetting.OnDrawVisualElements(root, onChangedCallback);
             m_MaxSetting.OnDrawVisualElements(root, onChangedCallback);
+            CustomOrDefaultSetting.AddSharedDefaultSettingsFooter(root,
+                new[] { m_MinSetting, m_MaxSetting });
         }
 
         private CustomOrDefaultSetting m_MinSetting;

Packages/com.unity.inputsystem/Editor/Controls/Processors/StickDeadzoneProcessorEditor.cs

@@ -34,6 +34,8 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
         {
             m_MinSetting.OnDrawVisualElements(root, onChangedCallback);
             m_MaxSetting.OnDrawVisualElements(root, onChangedCallback);
+            CustomOrDefaultSetting.AddSharedDefaultSettingsFooter(root,
+                new[] { m_MinSetting, m_MaxSetting });
         }
 
         private CustomOrDefaultSetting m_MinSetting;