PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev

Browse Source
This commit is contained in:
Aleksandar Kiridžić
2023-05-22 15:40:08 +00:00
committed by Android (Google) Code Review
parent 7aa8424cc0 30fd927eba
commit bcae90c372
3 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/language/LanguageSettings.java
View File

@@ -39,6 +39,8 @@ import java.util.List;
public class LanguageSettings extends DashboardFragment { public class LanguageSettings extends DashboardFragment {
private static final String KEY_SPEECH_CATEGORY = "speech_category"; 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";
private static final String TAG = "LanguageSettings"; private static final String TAG = "LanguageSettings";
@@ -81,9 +83,9 @@ public class LanguageSettings extends DashboardFragment {
final DefaultVoiceInputPreferenceController defaultVoiceInputPreferenceController = final DefaultVoiceInputPreferenceController defaultVoiceInputPreferenceController =
new DefaultVoiceInputPreferenceController(context, lifecycle); new DefaultVoiceInputPreferenceController(context, lifecycle);
final TtsPreferenceController ttsPreferenceController = final TtsPreferenceController ttsPreferenceController =
new TtsPreferenceController(context); new TtsPreferenceController(context, KEY_TEXT_TO_SPEECH);
final OnDeviceRecognitionPreferenceController onDeviceRecognitionPreferenceController = final OnDeviceRecognitionPreferenceController onDeviceRecognitionPreferenceController =
new OnDeviceRecognitionPreferenceController(context); new OnDeviceRecognitionPreferenceController(context, KEY_ON_DEVICE_RECOGNITION);
controllers.add(defaultVoiceInputPreferenceController); controllers.add(defaultVoiceInputPreferenceController);
controllers.add(ttsPreferenceController); controllers.add(ttsPreferenceController);
@@ -103,6 +105,7 @@ public class LanguageSettings extends DashboardFragment {
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.language_settings) { new BaseSearchIndexProvider(R.xml.language_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers( public List<AbstractPreferenceController> createPreferenceControllers(
Context context) { Context context) {
return buildPreferenceControllers(context, null); return buildPreferenceControllers(context, null);

10
src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java
View File

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

10
src/com/android/settings/language/TtsPreferenceController.java
View File

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