Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60069d30 authored by Peter Zhang's avatar Peter Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add logging when a group tile with PreferenceCategory widget is added... 

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

src/com/android/settings/dashboard/DashboardFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -592,6 +592,12 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment 
            case SWITCH_WITH_ACTION:

                return new PrimarySwitchPreference(getPrefContext());

            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()));

            case ACTION:

            default:

tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java

+11 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ public class DashboardFragmentTest { 
    }



    @Test

    public void createPreference_isGroupTile_returnPreferenceCategory() {

    public void createPreference_isGroupTile_returnPreferenceCategory_logTileAdded() {

        final ProviderInfo providerInfo = new ProviderInfo();

        providerInfo.packageName = "pkg";

        providerInfo.name = "provider";
@@ -456,10 +456,20 @@ public class DashboardFragmentTest { 
        metaData.putString(META_DATA_PREFERENCE_KEYHINT, "injected_tile_key2");

        ProviderTile providerTile =

                new ProviderTile(providerInfo, mDashboardCategory.key, metaData);

        MetricsFeatureProvider metricsFeatureProvider =

                mFakeFeatureFactory.getMetricsFeatureProvider();

        when(metricsFeatureProvider.getAttribution(any())).thenReturn(123);



        final Preference pref = mTestFragment.createPreference(providerTile);



        assertThat(pref).isInstanceOf(PreferenceCategory.class);

        verify(metricsFeatureProvider)

                .action(

                        123,

                        SettingsEnums.ACTION_SETTINGS_GROUP_TILE_ADDED_TO_SCREEN,

                        mTestFragment.getMetricsCategory(),

                        "injected_tile_key2",

                        0);

    }



    @Test