Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dca164e8 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am:... 

Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7 am: 91611000 am: 9ad53e4e

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



Change-Id: Ic915dba7e9405bb541a07326b404de5308e3ea9a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2eb121ce 9ad53e4e

src/com/android/settings/applications/appinfo/AppLocaleDetails.java

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.widget.TextView; 


import androidx.preference.Preference;



import com.android.internal.app.LocaleHelper;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;
@@ -212,7 +213,7 @@ public class AppLocaleDetails extends SettingsPreferenceFragment { 
        if (appLocale == null) {

            return context.getString(R.string.preference_of_system_locale_summary);

        } else {

            return appLocale.getDisplayName(appLocale);

            return LocaleHelper.getDisplayName(appLocale, appLocale, true);

        }

    }

}