Merge "Merge pointer/tts categories into one without heading" into oc-dev

res/values/strings.xml

@@ -3933,8 +3933,6 @@
     <!-- Summary text for keyboards when no layout has been selected. [CHAR LIMIT=35] -->
     <string name="default_keyboard_layout">Default</string>
 
-    <!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
-    <string name="pointer_settings_category">Mouse/trackpad</string>
     <!-- On Languages & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
     <string name="pointer_speed">Pointer speed</string>
 
@@ -4845,8 +4843,6 @@
     <string name="voice_search_settings_title">Voice search</string>
     <!-- Title of keyboard settings list item within voice input/output settings -->
     <string name="keyboard_settings_title">Android keyboard</string>
-    <!-- Title for the 'voice input' category of voice input/output settings -->
-    <string name="voice_category">Speech</string>
 
     <!-- Voice input settings --><skip />
     <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->

res/xml/language_and_input.xml

@@ -97,22 +97,13 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="pointer_settings_category"
-        android:title="@string/pointer_settings_category">
+    <PreferenceCategory>
 
         <com.android.settings.PointerSpeedPreference
             android:key="pointer_speed"
             android:title="@string/pointer_speed"
             android:dialogTitle="@string/pointer_speed"/>
 
-    </PreferenceCategory>
-
-    <!-- TTS -->
-    <PreferenceCategory
-        android:key="voice_category"
-        android:title="@string/voice_category">
-
         <Preference
             android:key="tts_settings"
             android:title="@string/tts_settings_title"