Make eye gaze capability setting in configurator more consistent with the current MRTK profile (#10525)

* Move to better assembly

* Only enable the gaze capability if the current MRTK profile says to

* Better null checks

* Add message box in case the capability isn't set

* Add button to set the capability

Author: keveleigh

Assets/MRTK/Core/Inspectors/Profiles/MixedRealityPointerProfileInspector.cs

@@ -19,6 +19,11 @@ public class MixedRealityPointerProfileInspector : BaseMixedRealityToolkitConfig
         private static readonly GUIContent UseEyeTrackingDataContent = new GUIContent("Use Eye Tracking Data");
         private static readonly GUIContent RaycastLayerMaskContent = new GUIContent("Default Raycast LayerMasks");
 
+#if UNITY_2019_3_OR_NEWER
+        private const string EnableGazeCapabilityContent = "To use eye tracking with UWP, the GazeInput capability needs to be set in the manifest." +
+            "\nPlease click the button below to set it in the Unity UWP Player Settings and check the Visual Studio appxmanifest capabilities to ensure it's enabled.";
+#endif // UNITY_2019_3_OR_NEWER
+
         private const string ProfileTitle = "Pointer Settings";
         private const string ProfileDescription = "Pointers attach themselves onto controllers as they are initialized.";
 
@@ -91,6 +96,17 @@ public override void OnInspectorGUI()
                     InspectorUIUtility.RenderDocumentationButton(helpURL);
                     EditorGUILayout.EndHorizontal();
 
+#if UNITY_2019_3_OR_NEWER
+                    if (useEyeTrackingDataWhenAvailable.boolValue && MixedRealityOptimizeUtils.IsBuildTargetUWP() && !PlayerSettings.WSA.GetCapability(PlayerSettings.WSACapability.GazeInput))
+                    {
+                        EditorGUILayout.HelpBox(EnableGazeCapabilityContent, MessageType.Warning);
+                        if (InspectorUIUtility.RenderIndentedButton("Set GazeInput capability"))
+                        {
+                            PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.GazeInput, true);
+                        }
+                    }
+#endif // UNITY_2019_3_OR_NEWER
+
                     EditorGUILayout.Space();
 
                     var gazeProvider = CameraCache.Main.GetComponent<IMixedRealityGazeProvider>();
@@ -253,4 +269,4 @@ private void RenderPointerList(SerializedProperty list)
             }
         }
     }
-}
+}

Assets/MRTK/Core/Utilities/Editor/Setup/MixedRealityProjectConfigurator.cs renamed to Assets/MRTK/Core/Inspectors/Setup/MixedRealityProjectConfigurator.cs

@@ -132,7 +132,11 @@ public bool IsActiveBuildTargetValid()
             { Configurations.MicrophoneCapability, new ConfigGetter(() => GetCapability(PlayerSettings.WSACapability.Microphone), BuildTarget.WSAPlayer) },
             { Configurations.InternetClientCapability, new ConfigGetter(() => GetCapability(PlayerSettings.WSACapability.InternetClient), BuildTarget.WSAPlayer) },
 #if UNITY_2019_3_OR_NEWER
-            { Configurations.EyeTrackingCapability, new ConfigGetter(() => GetCapability(PlayerSettings.WSACapability.GazeInput), BuildTarget.WSAPlayer) },
+            { Configurations.EyeTrackingCapability, new ConfigGetter(() => GetCapability(PlayerSettings.WSACapability.GazeInput)
+                                                                           || !(CoreServices.InputSystem != null
+                                                                                && CoreServices.InputSystem.InputSystemProfile != null
+                                                                                && CoreServices.InputSystem.InputSystemProfile.PointerProfile != null
+                                                                                && CoreServices.InputSystem.InputSystemProfile.PointerProfile.IsEyeTrackingEnabled), BuildTarget.WSAPlayer) },
 #endif // UNITY_2019_3_OR_NEWER
 
 #if UNITY_2019_3_OR_NEWER