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

Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9 am: 916110007d am: 9ad53e4e89

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599

Change-Id: Ic915dba7e9405bb541a07326b404de5308e3ea9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Hsu
2022-12-02 08:51:07 +00:00
committed by Automerger Merge Worker
parent 2eb121ce3f 9ad53e4e89
commit dca164e800
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/appinfo/AppLocaleDetails.java
View File

@@ -35,6 +35,7 @@ import android.widget.TextView;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.internal.app.LocaleHelper;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
@@ -212,7 +213,7 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {
if (appLocale == null) { if (appLocale == null) {
return context.getString(R.string.preference_of_system_locale_summary); return context.getString(R.string.preference_of_system_locale_summary);
} else { } else {
return appLocale.getDisplayName(appLocale); return LocaleHelper.getDisplayName(appLocale, appLocale, true);
} }
} }
} }