Unify voice interactor and recognizer settings.
There is now one settings UI to select both the new
voice interactor and old voice recognizer.
There are still a few wonky things about this that won't
be resolved until we start requiring that all interactors
specify an associated recognizer service.
Change-Id: Ib702ff717fb28bcb244cb30e49577066ddc9f197
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index b493a0f..9d12857 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -99,31 +99,11 @@
android:key="voice_category"
android:title="@string/voice_category" >
- <!-- entries, entryValues, and defaultValue will be populated programmatically. -->
- <ListPreference
- android:key="voice_interactor"
- android:title="@string/voice_interactor_title"
- android:dialogTitle="@string/voice_interactor_title"
- />
-
- <!-- An intent for this preference will be populated programmatically. -->
<PreferenceScreen
- android:key="voice_interactor_settings"
- android:title="@string/voice_interactor_settings_title"
- />
-
- <!-- entries, entryValues, and defaultValue will be populated programmatically. -->
- <ListPreference
- android:key="recognizer"
- android:title="@string/recognizer_title"
- android:dialogTitle="@string/recognizer_title"
- />
-
- <!-- An intent for this preference will be populated programmatically. -->
- <PreferenceScreen
- android:key="recognizer_settings"
- android:title="@string/recognizer_settings_title"
- settings:keywords="@string/keywords_search_voice"
+ android:key="voice_input_settings"
+ android:title="@string/voice_input_settings_title"
+ settings:keywords="@string/keywords_voice_input"
+ android:fragment="com.android.settings.voice.VoiceInputSettings"
/>
<PreferenceScreen