From 8f1e3fec84f0ade8f974c452dc9be3bf45c49507 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Fri, 18 Mar 2022 06:51:31 +0000 Subject: [PATCH] Hide emergency setting from "Search settings" Use the same config value created in ag/16497464 and ag/16497621 to determine if emergency setting should be searchable in Settings. Bug: 220437126 Test: Manual test on affected phone and tablet Change-Id: I964dd9f75f6a5c3b239aabfa4dfce84cb75c8565 --- .../settings/emergency/EmergencyDashboardFragment.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/emergency/EmergencyDashboardFragment.java b/src/com/android/settings/emergency/EmergencyDashboardFragment.java index 33566458a08..aa5a2ec08d4 100644 --- a/src/com/android/settings/emergency/EmergencyDashboardFragment.java +++ b/src/com/android/settings/emergency/EmergencyDashboardFragment.java @@ -66,5 +66,10 @@ public class EmergencyDashboardFragment extends DashboardFragment { } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.emergency_settings); + new BaseSearchIndexProvider(R.xml.emergency_settings) { + @Override + protected boolean isPageSearchEnabled(Context context) { + return context.getResources().getBoolean(R.bool.config_show_emergency_settings); + } + }; }