Merge "Remove call to actionWithSource."

src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java

@@ -18,6 +18,7 @@ package com.android.settings.applications.appinfo;
 
 import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;
 
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
@@ -61,8 +62,10 @@ public class AppSettingPreferenceController extends AppInfoPreferenceControllerB
             return false;
         }
         FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()
-                .actionWithSource(mContext, mParent.getMetricsCategory(),
-                        ACTION_OPEN_APP_SETTING);
+                .action(SettingsEnums.PAGE_UNKNOWN,
+                        ACTION_OPEN_APP_SETTING,
+                        mParent.getMetricsCategory(),
+                        null, 0);
         mContext.startActivity(intent);
         return true;
     }

src/com/android/settings/core/instrumentation/StatsLogWriter.java

@@ -45,7 +45,7 @@ public class StatsLogWriter implements LogWriter {
                 0 /* changedPreferenceIntValue */);
     }
 
-    @Override
+   @Override
     public void action(Context context, int action, Pair<Integer, Object>... taggedData) {
         action(SettingsEnums.PAGE_UNKNOWN /* attribution */,
                 action,
@@ -54,15 +54,6 @@ public class StatsLogWriter implements LogWriter {
                 0 /* changedPreferenceIntValue */);
     }
 
-    @Override
-    public void actionWithSource(Context context, int pageId, int action) {
-        action(SettingsEnums.PAGE_UNKNOWN /* attribution */,
-                action,
-                pageId /* pageId */,
-                null /* changedPreferenceKey */,
-                0 /* changedPreferenceIntValue */);
-    }
-
     @Override
     public void action(Context context, int action, int value) {
         action(SettingsEnums.PAGE_UNKNOWN /* attribution */,

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

@@ -16,6 +16,7 @@
 package com.android.settings.dashboard;
 
 import android.app.Activity;
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Icon;
@@ -211,8 +212,9 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
 
     @Override
     public void onExpandButtonClick() {
-        mMetricsFeatureProvider.actionWithSource(getContext(), getMetricsCategory(),
-                MetricsEvent.ACTION_SETTINGS_ADVANCED_BUTTON_EXPAND);
+        mMetricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
+                MetricsEvent.ACTION_SETTINGS_ADVANCED_BUTTON_EXPAND,
+                getMetricsCategory(), null, 0);
     }
 
     protected boolean shouldForceRoundedIcon() {

src/com/android/settings/widget/EntityHeaderController.java

@@ -23,6 +23,7 @@ import android.annotation.IdRes;
 import android.annotation.UserIdInt;
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -355,14 +356,13 @@ public class EntityHeaderController {
                 if (mAppNotifPrefIntent == null) {
                     button.setVisibility(View.GONE);
                 } else {
-                    button.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()
-                                    .actionWithSource(mAppContext, mMetricsCategory,
-                                            ACTION_OPEN_APP_NOTIFICATION_SETTING);
-                            mFragment.startActivity(mAppNotifPrefIntent);
-                        }
+                    button.setOnClickListener(v -> {
+                        FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()
+                                .action(SettingsEnums.PAGE_UNKNOWN,
+                                        ACTION_OPEN_APP_NOTIFICATION_SETTING,
+                                        mMetricsCategory,
+                                        null, 0);
+                        mFragment.startActivity(mAppNotifPrefIntent);
                     });
                     button.setVisibility(View.VISIBLE);
                 }

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

@@ -15,6 +15,8 @@
  */
 package com.android.settings.dashboard;
 
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.DASHBOARD_CONTAINER;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.nullable;
@@ -25,6 +27,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
@@ -185,9 +188,9 @@ public class DashboardFragmentTest {
                 = mFakeFeatureFactory.getMetricsFeatureProvider();
         mTestFragment.onExpandButtonClick();
 
-        verify(metricsFeatureProvider).actionWithSource(
-                RuntimeEnvironment.application, MetricsEvent.DASHBOARD_CONTAINER,
-                MetricsEvent.ACTION_SETTINGS_ADVANCED_BUTTON_EXPAND);
+        verify(metricsFeatureProvider).action(SettingsEnums.PAGE_UNKNOWN,
+                MetricsEvent.ACTION_SETTINGS_ADVANCED_BUTTON_EXPAND,
+                DASHBOARD_CONTAINER, null, 0);
     }
 
     public static class TestPreferenceController extends AbstractPreferenceController
@@ -243,7 +246,7 @@ public class DashboardFragmentTest {
 
         @Override
         public int getMetricsCategory() {
-            return MetricsEvent.DASHBOARD_CONTAINER;
+            return DASHBOARD_CONTAINER;
         }
 
         @Override