Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
diff --git a/res/xml/tts_engine_settings.xml b/res/xml/tts_engine_settings.xml
index 03414e8..176bdbc 100644
--- a/res/xml/tts_engine_settings.xml
+++ b/res/xml/tts_engine_settings.xml
@@ -19,16 +19,19 @@
android:key="tts_default_lang"
android:title="@string/tts_default_lang_title"
android:summary="@string/tts_default_lang_summary"
- android:persistent="false" />
+ android:persistent="false"
+ android:order="100" />
<Preference
android:key="tts_engine_settings"
android:persistent="false"
- android:title="@string/tts_engine_settings_title" />
+ android:title="@string/tts_engine_settings_title"
+ android:order="200" />
<Preference
android:key="tts_install_data"
android:persistent="false"
android:title="@string/tts_install_data_title"
- android:summary="@string/tts_install_data_summary" />
+ android:summary="@string/tts_install_data_summary"
+ android:order="300" />
</PreferenceScreen>
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 3c1fc7c..97a6165 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -776,7 +776,7 @@
getActivity().getResources().getString(
R.string.dev_settings_warning_message))
.setTitle(R.string.dev_settings_warning_title)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.no, this)
.show();
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index f5ec316..101764d 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -920,7 +920,7 @@
case DLG_DISABLE_NOTIFICATIONS:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_disable_notifications_dlg_title))
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.app_disable_notifications_dlg_text))
.setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index ea3ddf4..13f4435 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -155,7 +155,7 @@
if (mDialog == null) {
mDialog = (new AlertDialog.Builder(getActivity()))
.setTitle(android.R.string.dialog_alert_title)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setCancelable(true)
.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index 267b8e1..d8e32aa 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -104,7 +104,8 @@
mInstallVoicesPreference.setOnPreferenceClickListener(this);
// Remove this preference unless voices are indeed available to install.
root.removePreference(mInstallVoicesPreference);
-
+ // Remove this preference unless locales are indeed available.
+ root.removePreference(mLocalePreference);
root.setTitle(getEngineLabel());
root.setKey(getEngineName());
@@ -121,8 +122,6 @@
mVoiceDataDetails = getArguments().getParcelable(TtsEnginePreference.FRAGMENT_ARGS_VOICES);
- updateVoiceDetails();
-
mTts = new TextToSpeech(getActivity().getApplicationContext(), mTtsInitListener,
getEngineName());
@@ -169,9 +168,8 @@
if (available == null){
Log.e(TAG, "TTS data check failed (available == null).");
- final CharSequence[] empty = new CharSequence[0];
- mLocalePreference.setEntries(empty);
- mLocalePreference.setEntryValues(empty);
+ mLocalePreference.setEnabled(false);
+ getPreferenceScreen().removePreference(mLocalePreference);
return;
}
@@ -183,11 +181,12 @@
}
if (available.size() > 0) {
+ mLocalePreference.setEnabled(true);
+ getPreferenceScreen().addPreference(mLocalePreference);
updateDefaultLocalePref(available);
} else {
- final CharSequence[] empty = new CharSequence[0];
- mLocalePreference.setEntries(empty);
- mLocalePreference.setEntryValues(empty);
+ mLocalePreference.setEnabled(false);
+ getPreferenceScreen().removePreference(mLocalePreference);
}
}