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

[Regional Preference] Remove string from metrics

Browse Source 
Bug: 296544040
Test: atest NumberingSystemItemControllerTest
Change-Id: I1e1dd678011a15bc22b167ddd12651a22f62dea9
This commit is contained in:
Zoey Chen
2023-11-21 04:44:35 +00:00
parent 1ffc3df42a
commit a76af961b2
5 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
View File

@@ -232,8 +232,7 @@ class LocaleDragAndDropAdapter
if (fromPosition != toPosition) { if (fromPosition != toPosition) {
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
.action(mContext, SettingsEnums.ACTION_REORDER_LANGUAGE, .action(mContext, SettingsEnums.ACTION_REORDER_LANGUAGE);
mDragLocale.getLocale().toLanguageTag() + " move to " + toPosition);
} }
notifyItemChanged(fromPosition); // to update the numbers notifyItemChanged(fromPosition); // to update the numbers
@@ -275,8 +274,7 @@ class LocaleDragAndDropAdapter
localeInfo = mFeedItemList.get(i); localeInfo = mFeedItemList.get(i);
if (localeInfo.getChecked()) { if (localeInfo.getChecked()) {
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider() FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
.action(mContext, SettingsEnums.ACTION_REMOVE_LANGUAGE, .action(mContext, SettingsEnums.ACTION_REMOVE_LANGUAGE);
localeInfo.getLocale().toLanguageTag());
mFeedItemList.remove(i); mFeedItemList.remove(i);
} }
} }

6
src/com/android/settings/localepicker/LocaleListEditor.java
View File

@@ -224,8 +224,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
localeInfo = mayAppendUnicodeTags(localeInfo, preferencesTags); localeInfo = mayAppendUnicodeTags(localeInfo, preferencesTags);
mAdapter.addLocale(localeInfo); mAdapter.addLocale(localeInfo);
updateVisibilityOfRemoveMenu(); updateVisibilityOfRemoveMenu();
mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_ADD_LANGUAGE, mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_ADD_LANGUAGE);
localeInfo.getLocale().toLanguageTag());
} else if (requestCode == DIALOG_CONFIRM_SYSTEM_DEFAULT) { } else if (requestCode == DIALOG_CONFIRM_SYSTEM_DEFAULT) {
localeInfo = mAdapter.getFeedItemList().get(0); localeInfo = mAdapter.getFeedItemList().get(0);
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
@@ -239,8 +238,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
localeDialogFragment.setArguments(args); localeDialogFragment.setArguments(args);
localeDialogFragment.show(mFragmentManager, TAG_DIALOG_NOT_AVAILABLE); localeDialogFragment.show(mFragmentManager, TAG_DIALOG_NOT_AVAILABLE);
mMetricsFeatureProvider.action(getContext(), mMetricsFeatureProvider.action(getContext(),
SettingsEnums.ACTION_NOT_SUPPORTED_SYSTEM_LANGUAGE, SettingsEnums.ACTION_NOT_SUPPORTED_SYSTEM_LANGUAGE);
localeInfo.getLocale().toLanguageTag());
} }
} else { } else {
mAdapter.notifyListChanged(localeInfo); mAdapter.notifyListChanged(localeInfo);

5
src/com/android/settings/regionalpreferences/NumberingSystemItemController.java
View File

@@ -153,7 +153,7 @@ public class NumberingSystemItemController extends BasePreferenceController {
private void handleLanguageSelect(Preference preference) { private void handleLanguageSelect(Preference preference) {
String selectedLanguage = preference.getKey(); String selectedLanguage = preference.getKey();
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES, selectedLanguage); SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES);
final Bundle extra = new Bundle(); final Bundle extra = new Bundle();
extra.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE, extra.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE,
ARG_VALUE_NUMBERING_SYSTEM_SELECT); ARG_VALUE_NUMBERING_SYSTEM_SELECT);
@@ -177,8 +177,7 @@ public class NumberingSystemItemController extends BasePreferenceController {
saveNumberingSystemToLocale(Locale.forLanguageTag(mSelectedLanguage), saveNumberingSystemToLocale(Locale.forLanguageTag(mSelectedLanguage),
numberingSystem); numberingSystem);
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES, SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES);
updatedLocale.getDisplayName() + ": " + numberingSystem);
// After updated locale to framework, this fragment will recreate, // After updated locale to framework, this fragment will recreate,
// so it needs to update the argument of selected language. // so it needs to update the argument of selected language.
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();

7
src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.regionalpreferences; package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
@@ -65,8 +66,10 @@ public abstract class RegionalPreferenceListBasePreferenceController extends
RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(), RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(),
item.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE) item.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE)
? null : item); ? null : item);
mMetricsFeatureProvider.action(mContext, getMetricsActionKey(), String metrics =
getPreferenceTitle(value) + " > " + getPreferenceTitle(item)); getMetricsActionKey() == SettingsEnums.ACTION_SET_FIRST_DAY_OF_WEEK ? ""
: getPreferenceTitle(value) + " > " + getPreferenceTitle(item);
mMetricsFeatureProvider.action(mContext, getMetricsActionKey(), metrics);
return true; return true;
}); });
pref.setSelected(!value.isEmpty() && item.equals(value)); pref.setSelected(!value.isEmpty() && item.equals(value));

6
tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java
View File

@@ -99,8 +99,7 @@ public class NumberingSystemItemControllerTest {
assertTrue(isCallingStartActivity); assertTrue(isCallingStartActivity);
verify(mFeatureFactory.metricsFeatureProvider).action( verify(mFeatureFactory.metricsFeatureProvider).action(
mApplicationContext, mApplicationContext,
SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES, SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES);
"I_am_the_key");
} }
@Test @Test
@@ -122,8 +121,7 @@ public class NumberingSystemItemControllerTest {
verify(mFragment).setArguments(any()); verify(mFragment).setArguments(any());
verify(mFeatureFactory.metricsFeatureProvider).action( verify(mFeatureFactory.metricsFeatureProvider).action(
mApplicationContext, SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES, mApplicationContext, SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES);
"test_key");
} }
@Test @Test