speech: Re-add on-device speech recognition settings entry

After `Settings > System > Languages & input` was separated into
`Settings > System > Languages` and `Settings > System > Keyboard`,
`On-device speech recognition` was lost. This CL adds it in the same
`Speech` preference category where it was before
and moves the category to `Settings > System > Languages`.

Bug: 278279110
Test: Manual, already existing robotests
Change-Id: I040c284dd3596f35ceacb6980ff89e611e29971c

res/xml/keyboard_settings.xml

@@ -33,21 +33,6 @@
             android:summary="@string/summary_placeholder"/>
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="speech_category"
-        android:title="@string/speech_category_title">
-        <com.android.settings.widget.GearPreference
-            android:key="voice_input_settings"
-            android:title="@string/voice_input_settings_title"
-            android:fragment="com.android.settings.language.DefaultVoiceInputPicker" />
-
-        <Preference
-            android:key="tts_settings_summary"
-            android:title="@string/tts_settings_title"
-            android:fragment="com.android.settings.tts.TextToSpeechSettings"
-            settings:searchable="false"/>
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="input_assistance_category"
         android:title="@string/input_assistance">

res/xml/language_and_input.xml

@@ -73,13 +73,6 @@
             android:title="@string/voice_input_settings_title"
             android:fragment="com.android.settings.language.DefaultVoiceInputPicker" />
 
-        <Preference
-            android:key="on_device_recognition_settings"
-            android:title="@string/on_device_recognition_settings_title"
-            android:summary="@string/on_device_recognition_settings_summary"
-            settings:controller=
-                "com.android.settings.language.OnDeviceRecognitionPreferenceController" />
-
         <Preference
             android:key="tts_settings_summary"
             android:title="@string/tts_settings_title"

res/xml/language_settings.xml

@@ -46,4 +46,26 @@
             settings:controller="com.android.settings.regionalpreferences.RegionalPreferencesController" />
 
     </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="speech_category"
+        android:title="@string/speech_category_title">
+        <com.android.settings.widget.GearPreference
+            android:key="voice_input_settings"
+            android:title="@string/voice_input_settings_title"
+            android:fragment="com.android.settings.language.DefaultVoiceInputPicker" />
+
+        <Preference
+            android:key="on_device_recognition_settings"
+            android:title="@string/on_device_recognition_settings_title"
+            android:summary="@string/on_device_recognition_settings_summary"
+            settings:controller=
+                "com.android.settings.language.OnDeviceRecognitionPreferenceController" />
+
+        <Preference
+            android:key="tts_settings_summary"
+            android:title="@string/tts_settings_title"
+            android:fragment="com.android.settings.tts.TextToSpeechSettings"
+            settings:searchable="false"/>
+    </PreferenceCategory>
 </PreferenceScreen>

src/com/android/settings/inputmethod/KeyboardSettings.java

@@ -30,9 +30,7 @@ import androidx.annotation.Nullable;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.language.DefaultVoiceInputPreferenceController;
 import com.android.settings.language.PointerSpeedController;
-import com.android.settings.language.TtsPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.PreferenceCategoryController;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -49,8 +47,6 @@ public class KeyboardSettings extends DashboardFragment {
     private static final String TAG = "KeyboardSettings";
 
     private static final String KEY_KEYBOARDS_CATEGORY = "keyboards_category";
-    private static final String KEY_SPEECH_CATEGORY = "speech_category";
-    private static final String KEY_TEXT_TO_SPEECH = "tts_settings_summary";
     private static final String KEY_POINTER_CATEGORY = "pointer_category";
 
     @Override
@@ -102,17 +98,6 @@ public class KeyboardSettings extends DashboardFragment {
                 Arrays.asList(virtualKeyboardPreferenceController,
                         physicalKeyboardPreferenceController)));
 
-        // Speech
-        final DefaultVoiceInputPreferenceController defaultVoiceInputPreferenceController =
-                new DefaultVoiceInputPreferenceController(context, lifecycle);
-        final TtsPreferenceController ttsPreferenceController =
-                new TtsPreferenceController(context, KEY_TEXT_TO_SPEECH);
-        controllers.add(defaultVoiceInputPreferenceController);
-        controllers.add(ttsPreferenceController);
-        controllers.add(new PreferenceCategoryController(context,
-                KEY_SPEECH_CATEGORY).setChildren(
-                Arrays.asList(defaultVoiceInputPreferenceController, ttsPreferenceController)));
-
         // Pointer
         final PointerSpeedController pointerController = new PointerSpeedController(context);
         controllers.add(pointerController);

src/com/android/settings/language/LanguageSettings.java

@@ -21,14 +21,25 @@ import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.util.FeatureFlagUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.PreferenceCategoryController;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.SearchIndexable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @SearchIndexable
 public class LanguageSettings extends DashboardFragment {
 
+    private static final String KEY_SPEECH_CATEGORY = "speech_category";
+
     private static final String TAG = "LanguageSettings";
 
     @Override
@@ -59,8 +70,43 @@ public class LanguageSettings extends DashboardFragment {
         return R.xml.language_settings;
     }
 
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getSettingsLifecycle());
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(
+            @NonNull Context context, @Nullable Lifecycle lifecycle) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+
+        final DefaultVoiceInputPreferenceController defaultVoiceInputPreferenceController =
+                new DefaultVoiceInputPreferenceController(context, lifecycle);
+        final TtsPreferenceController ttsPreferenceController =
+                new TtsPreferenceController(context);
+        final OnDeviceRecognitionPreferenceController onDeviceRecognitionPreferenceController =
+                new OnDeviceRecognitionPreferenceController(context);
+
+        controllers.add(defaultVoiceInputPreferenceController);
+        controllers.add(ttsPreferenceController);
+        List<AbstractPreferenceController> speechCategoryChildren = new ArrayList<>(
+                List.of(defaultVoiceInputPreferenceController, ttsPreferenceController));
+
+        if (onDeviceRecognitionPreferenceController.isAvailable()) {
+            controllers.add(onDeviceRecognitionPreferenceController);
+            speechCategoryChildren.add(onDeviceRecognitionPreferenceController);
+        }
+
+        controllers.add(new PreferenceCategoryController(context, KEY_SPEECH_CATEGORY)
+                .setChildren(speechCategoryChildren));
+
+        return controllers;
+    }
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.language_settings) {
+                public List<AbstractPreferenceController> createPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context, null);
+                }
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
                     return FeatureFlagUtils

src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java

@@ -33,10 +33,16 @@ import java.util.Optional;
 /** Controller of the On-device recognition preference. */
 public class OnDeviceRecognitionPreferenceController extends BasePreferenceController {
 
+    private static final String KEY_ON_DEVICE_RECOGNITION = "on_device_recognition_settings";
+
     private static final String TAG = "OnDeviceRecognitionPreferenceController";
 
     private Optional<Intent> mIntent;
 
+    public OnDeviceRecognitionPreferenceController(Context context) {
+        this(context, KEY_ON_DEVICE_RECOGNITION);
+    }
+
     public OnDeviceRecognitionPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
     }
@@ -51,6 +57,10 @@ public class OnDeviceRecognitionPreferenceController extends BasePreferenceContr
                 : CONDITIONALLY_UNAVAILABLE;
     }
 
+    public String getPreferenceKey() {
+        return KEY_ON_DEVICE_RECOGNITION;
+    }
+
     @Override
     public void updateState(Preference preference) {
         super.updateState(preference);

src/com/android/settings/language/TtsPreferenceController.java

@@ -26,9 +26,15 @@ import com.android.settings.core.BasePreferenceController;
 
 public class TtsPreferenceController extends BasePreferenceController {
 
+    private static final String KEY_TEXT_TO_SPEECH = "tts_settings_summary";
+
     @VisibleForTesting
     TtsEngines mTtsEngines;
 
+    public TtsPreferenceController(Context context) {
+        this(context, KEY_TEXT_TO_SPEECH);
+    }
+
     public TtsPreferenceController(Context context, String key) {
         super(context, key);
         mTtsEngines = new TtsEngines(context);
@@ -40,4 +46,8 @@ public class TtsPreferenceController extends BasePreferenceController {
                 mContext.getResources().getBoolean(R.bool.config_show_tts_settings_summary)
                 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
+
+    public String getPreferenceKey() {
+        return KEY_TEXT_TO_SPEECH;
+    }
 }