From 07505847e4823398f049108f074d6489fa2906e2 Mon Sep 17 00:00:00 2001 From: frankpreel Date: Tue, 20 May 2025 11:59:12 +0200 Subject: [PATCH] REF: https://gitlab.e.foundation/e/os/backlog/-/issues/3330 Add keys to exclude from search index, if the device does not have telephony support --- .../FindMyDeviceDashboardFragment.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/findmydevice/FindMyDeviceDashboardFragment.java b/src/com/android/settings/findmydevice/FindMyDeviceDashboardFragment.java index 9e84a3b15fe..1236b521f44 100644 --- a/src/com/android/settings/findmydevice/FindMyDeviceDashboardFragment.java +++ b/src/com/android/settings/findmydevice/FindMyDeviceDashboardFragment.java @@ -28,6 +28,9 @@ import androidx.fragment.app.Fragment; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.search.SearchIndexableRaw; + +import java.util.List; @SearchIndexable public class FindMyDeviceDashboardFragment extends Fragment { @@ -35,6 +38,8 @@ public class FindMyDeviceDashboardFragment extends Fragment { private static final String TAG = "FindMyDeviceDashboardFragment"; private static final String findMyDevicePackageName = "foundation.e.findmydevice"; private static final String findMyDeviceActivityName = "foundation.e.findmydevice.activity.FindMyDeviceActivity"; + private static final String KEY_TOP_LEVEL_FIND_MY_DEVICE = "top_level_find_my_device"; + private static final String KEY_FIND_MY_DEVICE = "find_my_device"; @Override public void onCreate(Bundle savedInstanceState) { @@ -52,5 +57,19 @@ public class FindMyDeviceDashboardFragment extends Fragment { } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.find_my_device_dashboard_settings); + new BaseSearchIndexProvider(R.xml.find_my_device_dashboard_settings) { + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + + // Check telephony support + PackageManager pm = context.getPackageManager(); + if (!pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { + keys.add(KEY_FIND_MY_DEVICE); + keys.add(KEY_TOP_LEVEL_FIND_MY_DEVICE); + } + return keys; + } + }; } -- GitLab