summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/network/NetworkDashboardFragment.java
diff options
context:
space:
mode:
authorMatthew Fritze <mfritze@google.com>2017-04-13 13:08:33 -0700
committerMatthew Fritze <mfritze@google.com>2017-04-27 12:36:16 -0700
commit2caaa7420df26fafc147757d0693d98cf0ed1607 (patch)
tree2c82fd8c1049247d5b2671d4aac288ab2dccf521 /src/com/android/settings/network/NetworkDashboardFragment.java
parent32d3d383cbf1b16cfe744c660252ccfaa304e855 (diff)
downloadpackages_apps_Settings-2caaa7420df26fafc147757d0693d98cf0ed1607.tar.gz
packages_apps_Settings-2caaa7420df26fafc147757d0693d98cf0ed1607.tar.bz2
packages_apps_Settings-2caaa7420df26fafc147757d0693d98cf0ed1607.zip
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
Diffstat (limited to 'src/com/android/settings/network/NetworkDashboardFragment.java')
-rw-r--r--src/com/android/settings/network/NetworkDashboardFragment.java8
1 files changed, 8 insertions, 0 deletions
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<String> getNonIndexableKeys(Context context) {
+ List<String> keys = new ArrayList<>();
+ // Remove master switch as a result
+ keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI);
+ return keys;
+ }
};
}