From 2caaa7420df26fafc147757d0693d98cf0ed1607 Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Thu, 13 Apr 2017 13:08:33 -0700 Subject: Remove search duplicates for Wifi and Bluetooth Remove the master switch duplicates between the switch and their targets. Only show the actual Wifi and Bluetooth settings as search results. Bug: 33701673 Test: make RunSettingsRoboTests Change-Id: I226cc8db40a308bd9bcfacdd4fc6ae709fb809c5 --- src/com/android/settings/network/NetworkDashboardFragment.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/com/android/settings/network/NetworkDashboardFragment.java') diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index a0ccf20db1..a28a726469 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -142,5 +142,13 @@ public class NetworkDashboardFragment extends DashboardFragment implements sir.xmlResId = R.xml.network_and_internet; return Arrays.asList(sir); } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = new ArrayList<>(); + // Remove master switch as a result + keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI); + return keys; + } }; } -- cgit v1.2.3