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

Merge "[Regional Preference] Need to remove the metrics by the metrics concil team's comment. part2" into main

Browse Source
This commit is contained in:
Zoey Chen
2023-08-24 00:57:28 +00:00
committed by Android (Google) Code Review
parent c2aa51aeae abe3265390
commit f54d94b1aa
5 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/localepicker/LocaleHelperPreferenceController.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.localepicker; package com.android.settings.localepicker;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.util.Log; import android.util.Log;
@@ -25,10 +24,8 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.HelpUtils; import com.android.settingslib.HelpUtils;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.widget.FooterPreference; 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 static final String KEY_FOOTER_LANGUAGE_PICKER = "footer_languages_picker";
private final MetricsFeatureProvider mMetricsFeatureProvider;
public LocaleHelperPreferenceController(Context context) { public LocaleHelperPreferenceController(Context context) {
super(context); super(context);
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
} }
@Override @Override
@@ -78,7 +72,6 @@ public class LocaleHelperPreferenceController extends AbstractPreferenceControll
mContext.getString(R.string.link_locale_picker_footer_learn_more), mContext.getString(R.string.link_locale_picker_footer_learn_more),
mContext.getClass().getName()); mContext.getClass().getName());
if (intent != null) { if (intent != null) {
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_LANGUAGES_LEARN_MORE);
mContext.startActivity(intent); mContext.startActivity(intent);
} else { } else {
Log.w(TAG, "HelpIntent is null"); Log.w(TAG, "HelpIntent is null");

6
src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListController.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.regionalpreferences; package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import com.android.settings.R; import com.android.settings.R;
@@ -58,9 +57,4 @@ public class FirstDayOfWeekItemListController extends
protected String[] getUnitValues() { protected String[] getUnitValues() {
return mContext.getResources().getStringArray(R.array.first_day_of_week); return mContext.getResources().getStringArray(R.array.first_day_of_week);
} }
@Override
protected int getMetricsActionKey() {
return SettingsEnums.ACTION_SET_FIRST_DAY_OF_WEEK;
}
} }

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

@@ -22,20 +22,16 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.TickButtonPreference; import com.android.settings.widget.TickButtonPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/** A base controller for handling all regional preferences controllers. */ /** A base controller for handling all regional preferences controllers. */
public abstract class RegionalPreferenceListBasePreferenceController extends public abstract class RegionalPreferenceListBasePreferenceController extends
BasePreferenceController { BasePreferenceController {
private final MetricsFeatureProvider mMetricsFeatureProvider;
private PreferenceCategory mPreferenceCategory; private PreferenceCategory mPreferenceCategory;
public RegionalPreferenceListBasePreferenceController(Context context, String preferenceKey) { public RegionalPreferenceListBasePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
} }
@Override @Override
@@ -65,8 +61,6 @@ 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(),
getPreferenceTitle(value) + " > " + getPreferenceTitle(item));
return true; return true;
}); });
pref.setSelected(!value.isEmpty() && item.equals(value)); pref.setSelected(!value.isEmpty() && item.equals(value));
@@ -96,8 +90,4 @@ public abstract class RegionalPreferenceListBasePreferenceController extends
protected abstract String getExtensionTypes(); protected abstract String getExtensionTypes();
protected abstract String[] getUnitValues(); protected abstract String[] getUnitValues();
protected abstract int getMetricsActionKey();
} }

6
src/com/android/settings/regionalpreferences/TemperatureUnitListController.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.regionalpreferences; package com.android.settings.regionalpreferences;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import com.android.settings.R; import com.android.settings.R;
@@ -56,9 +55,4 @@ public class TemperatureUnitListController extends RegionalPreferenceListBasePre
protected String[] getUnitValues() { protected String[] getUnitValues() {
return mContext.getResources().getStringArray(R.array.temperature_units); return mContext.getResources().getStringArray(R.array.temperature_units);
} }
@Override
protected int getMetricsActionKey() {
return SettingsEnums.ACTION_SET_TEMPERATURE_UNIT;
}
} }

8
tests/unit/src/com/android/settings/localepicker/LocaleHelperPreferenceControllerTest.java
View File

@@ -19,14 +19,12 @@ package com.android.settings.localepicker;
import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.os.Looper; import android.os.Looper;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreference;
import org.junit.Before; import org.junit.Before;
@@ -39,7 +37,6 @@ import org.mockito.MockitoAnnotations;
public class LocaleHelperPreferenceControllerTest { public class LocaleHelperPreferenceControllerTest {
private Context mContext; private Context mContext;
private LocaleHelperPreferenceController mLocaleHelperPreferenceController; private LocaleHelperPreferenceController mLocaleHelperPreferenceController;
private FakeFeatureFactory mFeatureFactory;
@Mock @Mock
private FooterPreference mMockFooterPreference; private FooterPreference mMockFooterPreference;
@@ -52,16 +49,11 @@ public class LocaleHelperPreferenceControllerTest {
} }
mContext = ApplicationProvider.getApplicationContext(); mContext = ApplicationProvider.getApplicationContext();
mLocaleHelperPreferenceController = new LocaleHelperPreferenceController(mContext); mLocaleHelperPreferenceController = new LocaleHelperPreferenceController(mContext);
mFeatureFactory = FakeFeatureFactory.setupForTest();
} }
@Test @Test
public void updateFooterPreference_setFooterPreference_hasClickAction() { public void updateFooterPreference_setFooterPreference_hasClickAction() {
mLocaleHelperPreferenceController.updateFooterPreference(mMockFooterPreference); mLocaleHelperPreferenceController.updateFooterPreference(mMockFooterPreference);
verify(mMockFooterPreference).setLearnMoreText(anyString()); verify(mMockFooterPreference).setLearnMoreText(anyString());
mMockFooterPreference.setLearnMoreAction(v -> {
verify(mFeatureFactory.metricsFeatureProvider).action(
mContext, SettingsEnums.ACTION_LANGUAGES_LEARN_MORE);
});
} }
} }