From a76af961b2fad0c7e7531ffcb1db98d97fa70380 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Tue, 21 Nov 2023 04:44:35 +0000 Subject: [PATCH] [Regional Preference] Remove string from metrics Bug: 296544040 Test: atest NumberingSystemItemControllerTest Change-Id: I1e1dd678011a15bc22b167ddd12651a22f62dea9 --- .../settings/localepicker/LocaleDragAndDropAdapter.java | 6 ++---- .../android/settings/localepicker/LocaleListEditor.java | 6 ++---- .../regionalpreferences/NumberingSystemItemController.java | 5 ++--- .../RegionalPreferenceListBasePreferenceController.java | 7 +++++-- .../NumberingSystemItemControllerTest.java | 6 ++---- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index 2fcb06a32b2..1b3a4f20af5 100644 --- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java +++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java @@ -232,8 +232,7 @@ class LocaleDragAndDropAdapter if (fromPosition != toPosition) { FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() - .action(mContext, SettingsEnums.ACTION_REORDER_LANGUAGE, - mDragLocale.getLocale().toLanguageTag() + " move to " + toPosition); + .action(mContext, SettingsEnums.ACTION_REORDER_LANGUAGE); } notifyItemChanged(fromPosition); // to update the numbers @@ -275,8 +274,7 @@ class LocaleDragAndDropAdapter localeInfo = mFeedItemList.get(i); if (localeInfo.getChecked()) { FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() - .action(mContext, SettingsEnums.ACTION_REMOVE_LANGUAGE, - localeInfo.getLocale().toLanguageTag()); + .action(mContext, SettingsEnums.ACTION_REMOVE_LANGUAGE); mFeedItemList.remove(i); } } diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index 59a39c8eee3..1c22fd9a0f4 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -224,8 +224,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View localeInfo = mayAppendUnicodeTags(localeInfo, preferencesTags); mAdapter.addLocale(localeInfo); updateVisibilityOfRemoveMenu(); - mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_ADD_LANGUAGE, - localeInfo.getLocale().toLanguageTag()); + mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_ADD_LANGUAGE); } else if (requestCode == DIALOG_CONFIRM_SYSTEM_DEFAULT) { localeInfo = mAdapter.getFeedItemList().get(0); if (resultCode == Activity.RESULT_OK) { @@ -239,8 +238,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View localeDialogFragment.setArguments(args); localeDialogFragment.show(mFragmentManager, TAG_DIALOG_NOT_AVAILABLE); mMetricsFeatureProvider.action(getContext(), - SettingsEnums.ACTION_NOT_SUPPORTED_SYSTEM_LANGUAGE, - localeInfo.getLocale().toLanguageTag()); + SettingsEnums.ACTION_NOT_SUPPORTED_SYSTEM_LANGUAGE); } } else { mAdapter.notifyListChanged(localeInfo); diff --git a/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java b/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java index a608fbf5735..de0d386ccae 100644 --- a/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java +++ b/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java @@ -153,7 +153,7 @@ public class NumberingSystemItemController extends BasePreferenceController { private void handleLanguageSelect(Preference preference) { String selectedLanguage = preference.getKey(); mMetricsFeatureProvider.action(mContext, - SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES, selectedLanguage); + SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES); final Bundle extra = new Bundle(); extra.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE, ARG_VALUE_NUMBERING_SYSTEM_SELECT); @@ -177,8 +177,7 @@ public class NumberingSystemItemController extends BasePreferenceController { saveNumberingSystemToLocale(Locale.forLanguageTag(mSelectedLanguage), numberingSystem); mMetricsFeatureProvider.action(mContext, - SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES, - updatedLocale.getDisplayName() + ": " + numberingSystem); + SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES); // After updated locale to framework, this fragment will recreate, // so it needs to update the argument of selected language. Bundle bundle = new Bundle(); diff --git a/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java b/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java index ac0e7ee8b27..8be0043e822 100644 --- a/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java +++ b/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.regionalpreferences; +import android.app.settings.SettingsEnums; import android.content.Context; import androidx.preference.PreferenceCategory; @@ -65,8 +66,10 @@ public abstract class RegionalPreferenceListBasePreferenceController extends RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(), item.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE) ? null : item); - mMetricsFeatureProvider.action(mContext, getMetricsActionKey(), - getPreferenceTitle(value) + " > " + getPreferenceTitle(item)); + String metrics = + getMetricsActionKey() == SettingsEnums.ACTION_SET_FIRST_DAY_OF_WEEK ? "" + : getPreferenceTitle(value) + " > " + getPreferenceTitle(item); + mMetricsFeatureProvider.action(mContext, getMetricsActionKey(), metrics); return true; }); pref.setSelected(!value.isEmpty() && item.equals(value)); diff --git a/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java index 5c42ad9dbfe..50e21fe6b3f 100644 --- a/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java +++ b/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java @@ -99,8 +99,7 @@ public class NumberingSystemItemControllerTest { assertTrue(isCallingStartActivity); verify(mFeatureFactory.metricsFeatureProvider).action( mApplicationContext, - SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES, - "I_am_the_key"); + SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES); } @Test @@ -122,8 +121,7 @@ public class NumberingSystemItemControllerTest { verify(mFragment).setArguments(any()); verify(mFeatureFactory.metricsFeatureProvider).action( - mApplicationContext, SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES, - "test_key"); + mApplicationContext, SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES); } @Test