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

Fix references to resources for Settings

Browse Source 
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
This commit is contained in:
Chaohui Wang
2023-07-31 15:56:42 +08:00
parent ed505c25fa
commit 2541381259
247 changed files with 859 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -548,7 +548,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
CharSequence[] entries = new CharSequence[availableLangs.size() + 1];
CharSequence[] entryValues = new CharSequence[availableLangs.size() + 1];
entries[0] = getActivity().getString(R.string.tts_lang_use_system);
entries[0] = getActivity().getString(com.android.settingslib.R.string.tts_lang_use_system);
entryValues[0] = "";
int i = 1;
@@ -570,7 +570,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
private void setLocalePreference(int index) {
if (index < 0) {
mLocalePreference.setValue("");
mLocalePreference.setSummary(R.string.tts_lang_not_selected);
mLocalePreference.setSummary(com.android.settingslib.R.string.tts_lang_not_selected);
} else {
mLocalePreference.setValueIndex(index);
mLocalePreference.setSummary(mLocalePreference.getEntries()[index]);
@@ -583,9 +583,9 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
try {
final String currentLang = mTts.getLanguage().getISO3Language();
String[] strings = getActivity().getResources().getStringArray(
R.array.tts_demo_strings);
com.android.settingslib.R.array.tts_demo_strings);
String[] langs = getActivity().getResources().getStringArray(
R.array.tts_demo_string_langs);
com.android.settingslib.R.array.tts_demo_string_langs);
for (int i = 0; i < strings.length; ++i) {
if (langs[i].equals(currentLang)) {
@@ -597,7 +597,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
// Ignore and fall back to default sample string
}
}
return getString(R.string.tts_default_sample_string);
return getString(com.android.settingslib.R.string.tts_default_sample_string);
}
private boolean isNetworkRequiredForSynthesis() {
@@ -746,7 +746,8 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
private void displayNetworkAlert() {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(android.R.string.dialog_alert_title)
.setMessage(getActivity().getString(R.string.tts_engine_network_required))
.setMessage(getActivity()
.getString(com.android.settingslib.R.string.tts_engine_network_required))
.setCancelable(false)
.setPositiveButton(android.R.string.ok, null);

3
src/com/android/settings/tts/TtsEnginePreferenceFragment.java
View File

@@ -152,7 +152,8 @@ public class TtsEnginePreferenceFragment extends RadioButtonPickerFragment {
final AlertDialog dialog = new AlertDialog.Builder(getPrefContext())
.setTitle(android.R.string.dialog_alert_title)
.setMessage(mContext.getString(
R.string.tts_engine_security_warning, info.loadLabel()))
com.android.settingslib.R.string.tts_engine_security_warning,
info.loadLabel()))
.setCancelable(true)
.setPositiveButton(android.R.string.ok, positiveOnClickListener)
.setNegativeButton(android.R.string.cancel, null)