From 40d482ed8784895522b5f0a024063c63765554a6 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Wed, 23 Aug 2023 05:10:28 +0000 Subject: [PATCH] [Regional Preference] Need to remove the metrics by the metrics concil team's comment. Bug: 297194348 Bug: 284094665 Test: manual Change-Id: I8eecba55288bfad6f81b5c8c1a8290afccdd5ef8 Merged-In: I8eecba55288bfad6f81b5c8c1a8290afccdd5ef8 --- .../localepicker/LocaleDialogFragment.java | 2 -- .../localepicker/LocaleDragAndDropAdapter.java | 14 -------------- .../LocaleHelperPreferenceController.java | 7 ------- .../settings/localepicker/LocaleListEditor.java | 2 -- .../FirstDayOfWeekItemListController.java | 6 ------ .../NumberingSystemItemController.java | 5 ----- ...onalPreferenceListBasePreferenceController.java | 11 ----------- .../TemperatureUnitListController.java | 6 ------ .../LocaleHelperPreferenceControllerTest.java | 8 -------- .../NumberingSystemItemControllerTest.java | 10 ---------- 10 files changed, 71 deletions(-) diff --git a/src/com/android/settings/localepicker/LocaleDialogFragment.java b/src/com/android/settings/localepicker/LocaleDialogFragment.java index 6c37e380c77..2457e796601 100644 --- a/src/com/android/settings/localepicker/LocaleDialogFragment.java +++ b/src/com/android/settings/localepicker/LocaleDialogFragment.java @@ -204,8 +204,6 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment { bundle.putInt(ARG_DIALOG_TYPE, DIALOG_CONFIRM_SYSTEM_DEFAULT); intent.putExtras(bundle); mParent.onActivityResult(DIALOG_CONFIRM_SYSTEM_DEFAULT, result, intent); - mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_CHANGE_LANGUAGE, - changed); } mShouldKeepDialog = false; } diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index 6054c599411..bfe074914ef 100644 --- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java +++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java @@ -16,7 +16,6 @@ package com.android.settings.localepicker; -import android.app.settings.SettingsEnums; import android.content.Context; import android.graphics.Canvas; import android.os.Bundle; @@ -39,7 +38,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.internal.app.LocalePicker; import com.android.internal.app.LocaleStore; import com.android.settings.R; -import com.android.settings.overlay.FeatureFactory; import com.android.settings.shortcut.ShortcutsUpdateTask; import java.text.NumberFormat; @@ -53,7 +51,6 @@ class LocaleDragAndDropAdapter private static final String TAG = "LocaleDragAndDropAdapter"; private static final String CFGKEY_SELECTED_LOCALES = "selectedLocales"; private static final String CFGKEY_DRAG_LOCALE = "dragLocales"; - private static final String CFGKEY_DRAG_LOCALES_TO_POSITION = "dragLocales_end"; private final Context mContext; private final ItemTouchHelper mItemTouchHelper; @@ -61,7 +58,6 @@ class LocaleDragAndDropAdapter private List mFeedItemList; private List mCacheItemList; private RecyclerView mParentView = null; - private LocaleListEditor mParent; private boolean mRemoveMode = false; private boolean mDragEnabled = true; private NumberFormat mNumberFormatter = NumberFormat.getNumberInstance(); @@ -94,7 +90,6 @@ class LocaleDragAndDropAdapter LocaleDragAndDropAdapter(LocaleListEditor parent, List feedItemList) { mFeedItemList = feedItemList; - mParent = parent; mCacheItemList = new ArrayList<>(feedItemList); mContext = parent.getContext(); @@ -230,12 +225,6 @@ class LocaleDragAndDropAdapter "Negative position in onItemMove %d -> %d", fromPosition, toPosition)); } - if (fromPosition != toPosition) { - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() - .action(mContext, SettingsEnums.ACTION_REORDER_LANGUAGE, - mDragLocale.getLocale().toLanguageTag() + " move to " + toPosition); - } - notifyItemChanged(fromPosition); // to update the numbers notifyItemChanged(toPosition); notifyItemMoved(fromPosition, toPosition); @@ -274,9 +263,6 @@ class LocaleDragAndDropAdapter for (int i = itemCount - 1; i >= 0; i--) { localeInfo = mFeedItemList.get(i); if (localeInfo.getChecked()) { - FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() - .action(mContext, SettingsEnums.ACTION_REMOVE_LANGUAGE, - localeInfo.getLocale().toLanguageTag()); mFeedItemList.remove(i); } } diff --git a/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java b/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java index 1227683ce73..a639c9d297a 100644 --- a/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java +++ b/src/com/android/settings/localepicker/LocaleHelperPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.localepicker; -import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.util.Log; @@ -25,10 +24,8 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.HelpUtils; import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.widget.FooterPreference; /** @@ -39,11 +36,8 @@ public class LocaleHelperPreferenceController extends AbstractPreferenceControll private static final String KEY_FOOTER_LANGUAGE_PICKER = "footer_languages_picker"; - private final MetricsFeatureProvider mMetricsFeatureProvider; - public LocaleHelperPreferenceController(Context context) { super(context); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); } @Override @@ -78,7 +72,6 @@ public class LocaleHelperPreferenceController extends AbstractPreferenceControll mContext.getString(R.string.link_locale_picker_footer_learn_more), mContext.getClass().getName()); if (intent != null) { - mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_LANGUAGES_LEARN_MORE); mContext.startActivity(intent); } else { Log.w(TAG, "HelpIntent is null"); diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index 65563ada1bc..a9ea42c9312 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -202,8 +202,6 @@ 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()); } else if (requestCode == DIALOG_CONFIRM_SYSTEM_DEFAULT) { localeInfo = mAdapter.getFeedItemList().get(0); if (resultCode == Activity.RESULT_OK) { diff --git a/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListController.java b/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListController.java index d509d2e2f12..03a59dec50b 100644 --- a/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListController.java +++ b/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListController.java @@ -16,7 +16,6 @@ package com.android.settings.regionalpreferences; -import android.app.settings.SettingsEnums; import android.content.Context; import com.android.settings.R; @@ -58,9 +57,4 @@ public class FirstDayOfWeekItemListController extends protected String[] getUnitValues() { return mContext.getResources().getStringArray(R.array.first_day_of_week); } - - @Override - protected int getMetricsActionKey() { - return SettingsEnums.ACTION_SET_FIRST_DAY_OF_WEEK; - } } diff --git a/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java b/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java index 2a99e9925ea..c1e77abf9ea 100644 --- a/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java +++ b/src/com/android/settings/regionalpreferences/NumberingSystemItemController.java @@ -152,8 +152,6 @@ 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); final Bundle extra = new Bundle(); extra.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE, ARG_VALUE_NUMBERING_SYSTEM_SELECT); @@ -176,9 +174,6 @@ public class NumberingSystemItemController extends BasePreferenceController { Locale updatedLocale = saveNumberingSystemToLocale(Locale.forLanguageTag(mSelectedLanguage), numberingSystem); - mMetricsFeatureProvider.action(mContext, - SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES, - updatedLocale.getDisplayName() + ": " + numberingSystem); // 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 432ce0e89e9..0608b0c02da 100644 --- a/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java +++ b/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.regionalpreferences; -import android.app.settings.SettingsEnums; import android.content.Context; import android.util.Log; @@ -25,20 +24,16 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.TickButtonPreference; -import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; /** A base controller for handling all regional preferences controllers. */ public abstract class RegionalPreferenceListBasePreferenceController extends BasePreferenceController { - private final MetricsFeatureProvider mMetricsFeatureProvider; private PreferenceCategory mPreferenceCategory; public RegionalPreferenceListBasePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); } @Override @@ -68,8 +63,6 @@ public abstract class RegionalPreferenceListBasePreferenceController extends RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(), item.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE) ? null : item); - mMetricsFeatureProvider.action(mContext, getMetricsActionKey(), - getPreferenceTitle(value) + " > " + getPreferenceTitle(item)); return true; }); pref.setSelected(!value.isEmpty() && item.equals(value)); @@ -99,8 +92,4 @@ public abstract class RegionalPreferenceListBasePreferenceController extends protected abstract String getExtensionTypes(); protected abstract String[] getUnitValues(); - - protected abstract int getMetricsActionKey(); - - } diff --git a/src/com/android/settings/regionalpreferences/TemperatureUnitListController.java b/src/com/android/settings/regionalpreferences/TemperatureUnitListController.java index 91ab1a25216..c51ca715987 100644 --- a/src/com/android/settings/regionalpreferences/TemperatureUnitListController.java +++ b/src/com/android/settings/regionalpreferences/TemperatureUnitListController.java @@ -16,7 +16,6 @@ package com.android.settings.regionalpreferences; -import android.app.settings.SettingsEnums; import android.content.Context; import com.android.settings.R; @@ -56,9 +55,4 @@ public class TemperatureUnitListController extends RegionalPreferenceListBasePre protected String[] getUnitValues() { return mContext.getResources().getStringArray(R.array.temperature_units); } - - @Override - protected int getMetricsActionKey() { - return SettingsEnums.ACTION_SET_TEMPERATURE_UNIT; - } } diff --git a/tests/unit/src/com/android/settings/localepicker/LocaleHelperPreferenceControllerTest.java b/tests/unit/src/com/android/settings/localepicker/LocaleHelperPreferenceControllerTest.java index 5ac367e35b2..31b8e794480 100644 --- a/tests/unit/src/com/android/settings/localepicker/LocaleHelperPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/LocaleHelperPreferenceControllerTest.java @@ -19,14 +19,12 @@ package com.android.settings.localepicker; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.verify; -import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Looper; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.widget.FooterPreference; import org.junit.Before; @@ -39,7 +37,6 @@ import org.mockito.MockitoAnnotations; public class LocaleHelperPreferenceControllerTest { private Context mContext; private LocaleHelperPreferenceController mLocaleHelperPreferenceController; - private FakeFeatureFactory mFeatureFactory; @Mock private FooterPreference mMockFooterPreference; @@ -52,16 +49,11 @@ public class LocaleHelperPreferenceControllerTest { } mContext = ApplicationProvider.getApplicationContext(); mLocaleHelperPreferenceController = new LocaleHelperPreferenceController(mContext); - mFeatureFactory = FakeFeatureFactory.setupForTest(); } @Test public void updateFooterPreference_setFooterPreference_hasClickAction() { mLocaleHelperPreferenceController.updateFooterPreference(mMockFooterPreference); verify(mMockFooterPreference).setLearnMoreText(anyString()); - mMockFooterPreference.setLearnMoreAction(v -> { - verify(mFeatureFactory.metricsFeatureProvider).action( - mContext, SettingsEnums.ACTION_LANGUAGES_LEARN_MORE); - }); } } diff --git a/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java index 5c42ad9dbfe..0a67824831a 100644 --- a/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java +++ b/tests/unit/src/com/android/settings/regionalpreferences/NumberingSystemItemControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.os.LocaleList; @@ -52,7 +51,6 @@ public class NumberingSystemItemControllerTest { private NumberingPreferencesFragment mFragment; private PreferenceScreen mPreferenceScreen; private LocaleList mCacheLocale; - private FakeFeatureFactory mFeatureFactory; @Before @UiThreadTest @@ -61,7 +59,6 @@ public class NumberingSystemItemControllerTest { Looper.prepare(); } mApplicationContext = ApplicationProvider.getApplicationContext(); - mFeatureFactory = FakeFeatureFactory.setupForTest(); mFragment = spy(new NumberingPreferencesFragment()); PreferenceManager preferenceManager = new PreferenceManager(mApplicationContext); mPreferenceScreen = preferenceManager.createPreferenceScreen(mApplicationContext); @@ -97,10 +94,6 @@ public class NumberingSystemItemControllerTest { } assertTrue(isCallingStartActivity); - verify(mFeatureFactory.metricsFeatureProvider).action( - mApplicationContext, - SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES, - "I_am_the_key"); } @Test @@ -121,9 +114,6 @@ public class NumberingSystemItemControllerTest { mController.handlePreferenceTreeClick(preference); verify(mFragment).setArguments(any()); - verify(mFeatureFactory.metricsFeatureProvider).action( - mApplicationContext, SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES, - "test_key"); } @Test