From 8588bf2950b2168f13edfe255c2bf6e289e377eb Mon Sep 17 00:00:00 2001 From: danielwbhuang Date: Fri, 27 Dec 2024 16:56:22 +0800 Subject: [PATCH] Relocate Speech entry point Bug: 383051970 Flag: android.provider.system_regional_preferences_api_enabled Test: check hsv Change-Id: Id5cbeef4263d94a9c9ebef7ede291b277a740871 --- res/values/strings.xml | 4 + res/xml/language_and_region_settings.xml | 29 ++--- res/xml/speech_settings.xml | 49 ++++++++ .../settings/language/SpeechSettings.java | 106 ++++++++++++++++++ 4 files changed, 166 insertions(+), 22 deletions(-) create mode 100644 res/xml/speech_settings.xml create mode 100644 src/com/android/settings/language/SpeechSettings.java diff --git a/res/values/strings.xml b/res/values/strings.xml index c4c7fec5497..907eb335a0e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4865,6 +4865,10 @@ Speech + + Speech + + Control speech recognition and output Pointer speed diff --git a/res/xml/language_and_region_settings.xml b/res/xml/language_and_region_settings.xml index 1d59532d3e2..96d4e67b467 100644 --- a/res/xml/language_and_region_settings.xml +++ b/res/xml/language_and_region_settings.xml @@ -44,6 +44,13 @@ android:name="classname" android:value="com.android.settings.applications.appinfo.AppLocaleDetails" /> + + + - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/com/android/settings/language/SpeechSettings.java b/src/com/android/settings/language/SpeechSettings.java new file mode 100644 index 00000000000..4032e3cd015 --- /dev/null +++ b/src/com/android/settings/language/SpeechSettings.java @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2024 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. + */ + +package com.android.settings.language; + +import android.content.Context; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.android.settings.R; +import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.flags.Flags; +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 java.util.ArrayList; +import java.util.List; + +public class SpeechSettings extends DashboardFragment { + + private static final String TAG = "SpeechSettings"; + private static final String KEY_SPEECH_CATEGORY = "speech_category"; + private static final String KEY_ON_DEVICE_RECOGNITION = "on_device_recognition_settings"; + private static final String KEY_TEXT_TO_SPEECH = "tts_settings_summary"; + + @Override + protected int getPreferenceScreenResId() { + return R.xml.speech_settings; + } + + @Override + protected String getLogTag() { + return TAG; + } + + @Override + public int getMetricsCategory() { + return 0; + } + + protected List createPreferenceControllers(Context context) { + return buildPreferenceControllers(context, getSettingsLifecycle()); + } + + private static List buildPreferenceControllers( + @NonNull Context context, @Nullable Lifecycle lifecycle) { + final List controllers = new ArrayList<>(); + + final DefaultVoiceInputPreferenceController defaultVoiceInputPreferenceController = + new DefaultVoiceInputPreferenceController(context, lifecycle); + final TtsPreferenceController ttsPreferenceController = + new TtsPreferenceController(context, KEY_TEXT_TO_SPEECH); + final OnDeviceRecognitionPreferenceController onDeviceRecognitionPreferenceController = + new OnDeviceRecognitionPreferenceController(context, KEY_ON_DEVICE_RECOGNITION); + + controllers.add(defaultVoiceInputPreferenceController); + controllers.add(ttsPreferenceController); + List 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_and_region_settings) { + + @Override + @NonNull + public List createPreferenceControllers( + @NonNull Context context) { + return buildPreferenceControllers(context, null); + } + + @Override + protected boolean isPageSearchEnabled(Context context) { + if (Flags.regionalPreferencesApiEnabled()) { + return true; + } + return false; + } + }; +}