From b5835a729ac52f95310c0466da683b44705392bd Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 8 Oct 2018 12:16:30 -0700 Subject: [PATCH] Log open search action in metrics. Change-Id: I80ab40d0767a9e6e561690f31bd092b384095b6e Fixes: 117341899 Test: robotests --- src/com/android/settings/search/SearchFeatureProvider.java | 7 +++++-- .../settings/search/actionbar/SearchMenuController.java | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java index ed26931eb70..caddb1fdb86 100644 --- a/src/com/android/settings/search/SearchFeatureProvider.java +++ b/src/com/android/settings/search/SearchFeatureProvider.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.Intent; import android.view.View; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.search.SearchIndexableResources; @@ -63,10 +64,12 @@ public interface SearchFeatureProvider { view.setOnClickListener(tb -> { final Intent intent = SEARCH_UI_INTENT; intent.setPackage(getSettingsIntelligencePkgName()); + final Context context = activity.getApplicationContext(); - FeatureFactory.getFactory( - activity.getApplicationContext()).getSlicesFeatureProvider() + FeatureFactory.getFactory(context).getSlicesFeatureProvider() .indexSliceDataAsync(activity.getApplicationContext()); + FeatureFactory.getFactory(context).getMetricsFeatureProvider() + .action(context, MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS); activity.startActivityForResult(intent, REQUEST_CODE); }); } diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index 6855717cdd8..81e9e60d941 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -17,6 +17,7 @@ package com.android.settings.search.actionbar; import android.annotation.NonNull; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.view.Menu; @@ -25,6 +26,7 @@ import android.view.MenuItem; import androidx.fragment.app.Fragment; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.overlay.FeatureFactory; @@ -70,10 +72,12 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); searchItem.setOnMenuItemClickListener(target -> { + final Context context = mHost.getContext(); final Intent intent = SearchFeatureProvider.SEARCH_UI_INTENT; intent.setPackage(FeatureFactory.getFactory(mHost.getContext()) .getSearchFeatureProvider().getSettingsIntelligencePkgName()); - + FeatureFactory.getFactory(context).getMetricsFeatureProvider() + .action(context, MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS); mHost.startActivityForResult(intent, 0 /* requestCode */); return true; });