Merge branch 'mrtk_development' into mrtk_development_hl2

Author: wiwei

Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsDictationInputProvider.cs

@@ -40,11 +40,10 @@ public WindowsDictationInputProvider(
             uint priority = DefaultPriority,
             BaseMixedRealityProfile profile = null) : base(registrar, inputSystem, inputSystemProfile, playspace, name, priority, profile) { }
 
-        /// <summary>
-        /// Is the Dictation Manager currently running?
-        /// </summary>
+        /// <inheritdoc />
         public bool IsListening { get; private set; } = false;
 
+#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
         private bool hasFailed;
         private bool hasListener;
         private bool isTransitioning;
@@ -151,6 +150,7 @@ public override async void Disable()
             }
         }
 
+        /// <inheritdoc />
         public override void Destroy()
         {
             if (Application.isPlaying)
@@ -326,6 +326,6 @@ private void DictationRecognizer_DictationError(string error, int hresult)
             textSoFar = null;
             dictationResult = string.Empty;
         }
-    }
 #endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
+    }
 }

Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsSpeechInputProvider.cs

@@ -3,12 +3,12 @@
 
 using Microsoft.MixedReality.Toolkit.Input;
 using Microsoft.MixedReality.Toolkit.Utilities;
-using System;
-using UnityEngine;
-using UInput = UnityEngine.Input;
 
 #if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
+using System;
+using UnityEngine;
 using UnityEngine.Windows.Speech;
+using UInput = UnityEngine.Input;
 #endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
 
 namespace Microsoft.MixedReality.Toolkit.Windows.Input
@@ -47,6 +47,12 @@ public WindowsSpeechInputProvider(
         /// </summary>
         public IMixedRealityInputSource InputSource = null;
 
+        /// <summary>
+        /// The minimum confidence level for the recognizer to fire an event.
+        /// </summary>
+        public RecognitionConfidenceLevel RecognitionConfidenceLevel { get; set; }
+
+#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
         private KeywordRecognizer keywordRecognizer;
 
         /// <inheritdoc />
@@ -55,8 +61,6 @@ public bool IsRecognitionActive
             get { return keywordRecognizer != null && keywordRecognizer.IsRunning; }
         }
 
-        public RecognitionConfidenceLevel RecognitionConfidenceLevel { get; set; }
-
         /// <inheritdoc />
         public override void Enable()
         {
@@ -151,6 +155,6 @@ private void OnPhraseRecognized(ConfidenceLevel confidence, TimeSpan phraseDurat
                 }
             }
         }
-    }
 #endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
+    }
 }