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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user