diff --git a/src/com/android/settings/language/LanguageSettings.java b/src/com/android/settings/language/LanguageSettings.java index 5da0f2f769a..82533115052 100644 --- a/src/com/android/settings/language/LanguageSettings.java +++ b/src/com/android/settings/language/LanguageSettings.java @@ -39,6 +39,8 @@ import java.util.List; public class LanguageSettings extends DashboardFragment { 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"; @@ -81,9 +83,9 @@ public class LanguageSettings extends DashboardFragment { final DefaultVoiceInputPreferenceController defaultVoiceInputPreferenceController = new DefaultVoiceInputPreferenceController(context, lifecycle); final TtsPreferenceController ttsPreferenceController = - new TtsPreferenceController(context); + new TtsPreferenceController(context, KEY_TEXT_TO_SPEECH); final OnDeviceRecognitionPreferenceController onDeviceRecognitionPreferenceController = - new OnDeviceRecognitionPreferenceController(context); + new OnDeviceRecognitionPreferenceController(context, KEY_ON_DEVICE_RECOGNITION); controllers.add(defaultVoiceInputPreferenceController); controllers.add(ttsPreferenceController); @@ -103,6 +105,7 @@ public class LanguageSettings extends DashboardFragment { public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.language_settings) { + @Override public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null); diff --git a/src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java b/src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java index 35b42187c8f..01f37b1f933 100644 --- a/src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java +++ b/src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java @@ -33,16 +33,10 @@ 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 mIntent; - public OnDeviceRecognitionPreferenceController(Context context) { - this(context, KEY_ON_DEVICE_RECOGNITION); - } - public OnDeviceRecognitionPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); } @@ -57,10 +51,6 @@ public class OnDeviceRecognitionPreferenceController extends BasePreferenceContr : CONDITIONALLY_UNAVAILABLE; } - public String getPreferenceKey() { - return KEY_ON_DEVICE_RECOGNITION; - } - @Override public void updateState(Preference preference) { super.updateState(preference); @@ -140,4 +130,4 @@ public class OnDeviceRecognitionPreferenceController extends BasePreferenceContr return new Intent(Intent.ACTION_MAIN).setComponent(chosenRecognizer.mSettings); } -} +} \ No newline at end of file diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java index b38920606cf..285f69bab85 100644 --- a/src/com/android/settings/language/TtsPreferenceController.java +++ b/src/com/android/settings/language/TtsPreferenceController.java @@ -26,15 +26,9 @@ 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); @@ -46,8 +40,4 @@ 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; - } -} +} \ No newline at end of file