From 6358f613cfdd632e3f794fa513cfffde13b89795 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Fri, 30 Jun 2023 02:59:10 +0000 Subject: [PATCH] [Panlingual] Change the metric's string in Languages Bug: 279915462 Test: manual Change-Id: I8e59f9acb068640da64d2a29cc6074b388994554 --- .../settings/localepicker/LocaleDragAndDropAdapter.java | 4 ++-- src/com/android/settings/localepicker/LocaleListEditor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index 6c254d954c1..3d7976ab624 100644 --- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java +++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java @@ -216,7 +216,7 @@ class LocaleDragAndDropAdapter if (fromPosition != toPosition) { FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() .action(mContext, SettingsEnums.ACTION_REORDER_LANGUAGE, - mDragLocale.getLocale().getDisplayName() + " move to " + toPosition); + mDragLocale.getLocale().toLanguageTag() + " move to " + toPosition); } notifyItemChanged(fromPosition); // to update the numbers @@ -259,7 +259,7 @@ class LocaleDragAndDropAdapter if (localeInfo.getChecked()) { FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() .action(mContext, SettingsEnums.ACTION_REMOVE_LANGUAGE, - localeInfo.getLocale().getDisplayName()); + localeInfo.getLocale().toLanguageTag()); mFeedItemList.remove(i); } } diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index 17d3a6aa996..dfdb9428f9c 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -203,7 +203,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View mAdapter.addLocale(localeInfo); updateVisibilityOfRemoveMenu(); mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_ADD_LANGUAGE, - localeInfo.getLocale().getDisplayName()); + localeInfo.getLocale().toLanguageTag()); } else if (requestCode == DIALOG_CONFIRM_SYSTEM_DEFAULT) { localeInfo = mAdapter.getFeedItemList().get(0); if (resultCode == Activity.RESULT_OK) { @@ -218,7 +218,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View localeDialogFragment.show(mFragmentManager, TAG_DIALOG_NOT_AVAILABLE); mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_NOT_SUPPORTED_SYSTEM_LANGUAGE, - localeInfo.getLocale().getDisplayName()); + localeInfo.getLocale().toLanguageTag()); } } else { mAdapter.notifyListChanged(localeInfo);