Merge "Remove DeviceIndex feature/service."
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d78b7b0..e90c718 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6971,6 +6971,9 @@
<!-- Search keyword for Ambient display settings screen. -->
<string name="keywords_ambient_display_screen">Ambient display, Lock screen display</string>
+ <!-- Search keyword for lock screen notification setting [CHAR_LIMIT=NONE] -->
+ <string name="keywords_lock_screen_notif">lock screen notification</string>
+
<!-- Search keyword for face settings. -->
<string name="keywords_face_settings">face</string>
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 51b1f5d..f829c8a 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -27,7 +27,8 @@
<com.android.settings.RestrictedListPreference
android:key="security_setting_lock_screen_notif"
android:title="@string/lock_screen_notifications_title"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"
+ settings:keywords="@string/keywords_lock_screen_notif"/>
<com.android.settingslib.RestrictedSwitchPreference
android:key="security_lockscreen_add_users_when_locked"
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index ed26931..caddb1f 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -23,6 +23,7 @@
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 @@
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 6855717..81e9e60 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 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 @@
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;
});