diff --git a/res/values/strings.xml b/res/values/strings.xml index df707c486cb..f3da56d04a2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -524,9 +524,6 @@ Language selection for this app isn\u2019t available from Settings. - - You can\u2019t select a language for this app from Settings. - Remove selected language? diff --git a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java index 4e5eb1d1abd..88e43a4b01c 100644 --- a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java +++ b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java @@ -208,13 +208,9 @@ public class AppLocaleDetails extends SettingsPreferenceFragment { LocaleList packageLocaleList = getPackageLocales(); String[] assetLocaleList = getAssetLocales(); // TODO add apended url string, "Learn more", to these both sentenses. - if (packageLocaleList == null && assetLocaleList.length == 0) { - // There is no locale info from PackageManager amd AssetManager. + if ((packageLocaleList != null && packageLocaleList.isEmpty()) + || (packageLocaleList == null && assetLocaleList.length == 0)) { return R.string.desc_no_available_supported_locale; - } else if (packageLocaleList != null && packageLocaleList.isEmpty()) { - // LocaleConfig is empty, and this means only allow user modify language - // by the application. - return R.string.desc_disallow_locale_change_in_settings; } return -1; }