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

Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev

Browse Source
This commit is contained in:
Peter Zhang
2023-05-12 16:22:38 +00:00
committed by Android (Google) Code Review
parent 04545138c7 f6a267bd36
commit 60069d3039
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -592,6 +592,12 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
case SWITCH_WITH_ACTION: case SWITCH_WITH_ACTION:
return new PrimarySwitchPreference(getPrefContext()); return new PrimarySwitchPreference(getPrefContext());
case GROUP: case GROUP:
mMetricsFeatureProvider.action(
mMetricsFeatureProvider.getAttribution(getActivity()),
SettingsEnums.ACTION_SETTINGS_GROUP_TILE_ADDED_TO_SCREEN,
getMetricsCategory(),
tile.getKey(getContext()),
/* value= */ 0);
return new PreferenceCategory((getPrefContext())); return new PreferenceCategory((getPrefContext()));
case ACTION: case ACTION:
default: default:

12
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

@@ -447,7 +447,7 @@ public class DashboardFragmentTest {
} }
@Test @Test
public void createPreference_isGroupTile_returnPreferenceCategory() { public void createPreference_isGroupTile_returnPreferenceCategory_logTileAdded() {
final ProviderInfo providerInfo = new ProviderInfo(); final ProviderInfo providerInfo = new ProviderInfo();
providerInfo.packageName = "pkg"; providerInfo.packageName = "pkg";
providerInfo.name = "provider"; providerInfo.name = "provider";
@@ -456,10 +456,20 @@ public class DashboardFragmentTest {
metaData.putString(META_DATA_PREFERENCE_KEYHINT, "injected_tile_key2"); metaData.putString(META_DATA_PREFERENCE_KEYHINT, "injected_tile_key2");
ProviderTile providerTile = ProviderTile providerTile =
new ProviderTile(providerInfo, mDashboardCategory.key, metaData); new ProviderTile(providerInfo, mDashboardCategory.key, metaData);
MetricsFeatureProvider metricsFeatureProvider =
mFakeFeatureFactory.getMetricsFeatureProvider();
when(metricsFeatureProvider.getAttribution(any())).thenReturn(123);
final Preference pref = mTestFragment.createPreference(providerTile); final Preference pref = mTestFragment.createPreference(providerTile);
assertThat(pref).isInstanceOf(PreferenceCategory.class); assertThat(pref).isInstanceOf(PreferenceCategory.class);
verify(metricsFeatureProvider)
.action(
123,
SettingsEnums.ACTION_SETTINGS_GROUP_TILE_ADDED_TO_SCREEN,
mTestFragment.getMetricsCategory(),
"injected_tile_key2",
0);
} }
@Test @Test