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
This commit is contained in:
@@ -96,9 +96,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
|
||||
keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
|
||||
keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
|
||||
}
|
||||
if (!pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
|
||||
keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
|
||||
}
|
||||
keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
|
||||
return keys;
|
||||
}
|
||||
};
|
||||
|
@@ -75,6 +75,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
|
||||
private static final String KEY_LIMIT_SUMMARY = "limit_summary";
|
||||
private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
|
||||
private static final String KEY_NETWORK_RESTRICTIONS = "network_restrictions";
|
||||
private static final String KEY_WIFI_USAGE_TITLE = "wifi_category";
|
||||
|
||||
private DataUsageController mDataUsageController;
|
||||
private DataUsageInfoController mDataInfoController;
|
||||
@@ -491,6 +492,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
|
||||
if (hasMobileData) {
|
||||
keys.add(KEY_RESTRICT_BACKGROUND);
|
||||
}
|
||||
keys.add(KEY_WIFI_USAGE_TITLE);
|
||||
|
||||
return keys;
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@@ -33,7 +33,7 @@ public class WifiMasterSwitchPreferenceController extends PreferenceController
|
||||
implements SummaryUpdater.OnSummaryChangeListener,
|
||||
LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
|
||||
|
||||
private static final String KEY_TOGGLE_WIFI = "toggle_wifi";
|
||||
public static final String KEY_TOGGLE_WIFI = "toggle_wifi";
|
||||
|
||||
private MasterSwitchPreference mWifiPreference;
|
||||
private WifiEnabler mWifiEnabler;
|
||||
|
Reference in New Issue
Block a user