Move Voice input/output settings to Language & keyboard
Bug: 3267042
Change-Id: I127a2e9d11fb70283812e68979bdde3976e32cf9
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8c94635..8bc4139 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2181,7 +2181,7 @@
<!-- Language Settings --> <skip />
<!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings realted to locale and text -->
- <string name="language_settings">Language & keyboard</string>
+ <string name="language_settings">Language & input</string>
<!-- Title of Language and keyboard settings screen -->
<string name="language_keyboard_settings_title">Language & keyboard settings</string>
<!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 2037fc7..3afe861 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -33,6 +33,28 @@
android:summary="@string/user_dict_settings_summary">
</PreferenceScreen>
+ <PreferenceCategory android:key="voice_input_category"
+ android:title="@string/voice_input_category" >
+
+ <!-- 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" />
+ </PreferenceCategory>
+
+ <PreferenceCategory android:key="voice_output_category"
+ android:title="@string/voice_output_category" >
+
+ <PreferenceScreen android:key="tts_settings"
+ android:fragment="com.android.settings.TextToSpeechSettings"
+ android:title="@string/tts_settings_title" />
+ </PreferenceCategory>
+
<PreferenceCategory android:key="keyboard_settings_category"
android:title="@string/keyboard_settings_category">
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 25f9368..5411308 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -119,14 +119,6 @@
android:icon="@drawable/ic_settings_language"
android:title="@string/language_settings" />
- <!-- Voice input & output -->
-
- <header
- android:id="@+id/voice_input_output_settings"
- android:fragment="com.android.settings.VoiceInputOutputSettings"
- android:icon="@drawable/ic_settings_speech"
- android:title="@string/voice_input_output_settings" />
-
<!-- Accessibility feedback -->
<header
diff --git a/res/xml/voice_input_output_settings.xml b/res/xml/voice_input_output_settings.xml
deleted file mode 100644
index 1645d88..0000000
--- a/res/xml/voice_input_output_settings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/voice_input_output_settings_title"
- android:key="parent">
-
- <PreferenceCategory android:key="voice_input_category"
- android:title="@string/voice_input_category" />
-
- <!-- 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" />
-
- <PreferenceCategory android:key="voice_output_category"
- android:title="@string/voice_output_category" />
-
- <PreferenceScreen android:key="tts_settings"
- android:fragment="com.android.settings.TextToSpeechSettings"
- android:title="@string/tts_settings_title" />
-
-</PreferenceScreen>