import android.content.Context;
import android.metrics.LogMaker;
+import android.util.Pair;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto;
MetricsLogger.action(context, category, Boolean.toString(value));
}
- public void action(Context context, int category, String pkg) {
- MetricsLogger.action(context, category, pkg);
+ public void action(Context context, int category, String pkg,
+ Pair<Integer, Object>... taggedData) {
+ if (taggedData == null || taggedData.length == 0) {
+ MetricsLogger.action(context, category, pkg);
+ } else {
+ final LogMaker logMaker = new LogMaker(category)
+ .setType(MetricsProto.MetricsEvent.TYPE_ACTION)
+ .setPackageName(pkg);
+ for (Pair<Integer, Object> pair : taggedData) {
+ logMaker.addTaggedData(pair.first, pair.second);
+ }
+ MetricsLogger.action(logMaker);
+ }
}
public void count(Context context, String name, int value) {
package com.android.settings.core.instrumentation;
import android.content.Context;
+import android.util.Pair;
/**
* Generic log writer interface.
/**
* Logs an user action.
*/
- void action(Context context, int category, String pkg);
+ void action(Context context, int category, String pkg, Pair<Integer, Object>... taggedData);
/**
* Logs a count.
package com.android.settings.core.instrumentation;
import android.content.Context;
+import android.util.Pair;
import com.android.internal.logging.nano.MetricsProto;
}
}
- public void action(Context context, int category, String pkg) {
+ public void action(Context context, int category, String pkg,
+ Pair<Integer, Object>... taggedData) {
for (LogWriter writer : mLoggerWriters) {
- writer.action(context, category, pkg);
+ writer.action(context, category, pkg, taggedData);
}
}
import android.content.Context;
import android.metrics.LogMaker;
+import android.util.Pair;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsLogger;
}
@Override
- public void action(Context context, int category, String pkg) {
+ public void action(Context context, int category, String pkg,
+ Pair<Integer, Object>... taggedData) {
if (mEventStore == null) {
mEventStore = new EventStore(context);
}
import android.provider.Settings;
import android.text.TextUtils;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
+import com.android.settings.SettingsActivity;
import com.android.settings.applications.ManageApplications;
import com.android.settings.applications.PackageManagerWrapper;
import com.android.settings.dashboard.SiteMapManager;
}
final Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
- .setData(Uri.fromParts("package", info.packageName, null));
+ .setData(Uri.fromParts("package", info.packageName, null))
+ .putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
+ MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
final AppSearchResult.Builder builder = new AppSearchResult.Builder();
builder.setAppInfo(info)
*/
package com.android.settings.search2;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.Pair;
import android.view.View;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
+
/**
* ViewHolder for intent based search results.
* The DatabaseResultLoader is the primary use case for this ViewHolder.
*/
public class IntentSearchViewHolder extends SearchViewHolder {
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
+
public IntentSearchViewHolder(View view) {
super(view);
+ mMetricsFeatureProvider = FeatureFactory.getFactory(view.getContext())
+ .getMetricsFeatureProvider();
}
@Override
public void onBind(final SearchFragment fragment, final SearchResult result) {
super.onBind(fragment, result);
- itemView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- fragment.onSearchResultClicked();
- fragment.startActivity(((IntentPayload) result.payload).intent);
+ itemView.setOnClickListener(v -> {
+ fragment.onSearchResultClicked();
+ final Intent intent = ((IntentPayload) result.payload).intent;
+ final ComponentName cn = intent.getComponent();
+ final Pair<Integer, Object> rank = Pair.create(
+ MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK, getAdapterPosition());
+ String resultName = intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT);
+ if (TextUtils.isEmpty(resultName) && cn != null) {
+ resultName = cn.flattenToString();
}
+ mMetricsFeatureProvider.action(v.getContext(),
+ MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT,
+ resultName, rank);
+ fragment.startActivity(intent);
});
}
}
package com.android.settings.search;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
+import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.search2.SearchFragment;
import com.android.settings.search2.SearchResult;
import com.android.settings.search2.SearchResult.Builder;
+import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
private static final String TITLE = "title";
private static final String SUMMARY = "summary";
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mContext;
@Mock
private SearchFragment mFragment;
+ private FakeFeatureFactory mFeatureFactory;
private IntentSearchViewHolder mHolder;
private Drawable mIcon;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ FakeFeatureFactory.setupForTest(mContext);
+ mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+
+ final Context context = RuntimeEnvironment.application;
View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
mHolder = new IntentSearchViewHolder(view);
verify(mFragment).onSearchResultClicked();
verify(mFragment).startActivity(any(Intent.class));
+ verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+ eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT),
+ eq(((IntentPayload)result.payload).intent.getComponent().flattenToString()),
+ any(Pair.class));
}
@Test
builder.addTitle(TITLE)
.addSummary(SUMMARY)
.addRank(1)
- .addPayload(new IntentPayload(null))
+ .addPayload(new IntentPayload(
+ new Intent().setComponent(new ComponentName("pkg", "class"))))
.addBreadcrumbs(new ArrayList<>())
.addIcon(mIcon);