Add ability to show/hide Wi-Fi settings, and all related sub-settings.
This adds a new boolean flag, config_show_wifi_settings, which when set to false will hide the "Wi-Fi" page in network & internet (there is no key value associated with this preference page). It will also hide nested pages from search results, such as Wi-Fi preferences. Bug: 62379554 Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest and make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest and make RunSettingsRoboTests ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest all pass. Change-Id: Iedc6bc272e0cb2b561c6bf25968e70f355aaaa8e
This commit is contained in:
@@ -167,7 +167,7 @@ public class WifiSettings extends RestrictedSettingsFragment
|
||||
private LinkablePreference mStatusMessagePreference;
|
||||
|
||||
// For Search
|
||||
private static final String DATA_KEY_REFERENCE = "main_toggle_wifi";
|
||||
public static final String DATA_KEY_REFERENCE = "main_toggle_wifi";
|
||||
|
||||
/**
|
||||
* Tracks whether the user initiated a connection via clicking in order to autoscroll to the
|
||||
@@ -1104,13 +1104,15 @@ public class WifiSettings extends RestrictedSettingsFragment
|
||||
final List<SearchIndexableRaw> result = new ArrayList<>();
|
||||
final Resources res = context.getResources();
|
||||
|
||||
// Add fragment title
|
||||
SearchIndexableRaw data = new SearchIndexableRaw(context);
|
||||
data.title = res.getString(R.string.wifi_settings);
|
||||
data.screenTitle = res.getString(R.string.wifi_settings);
|
||||
data.keywords = res.getString(R.string.keywords_wifi);
|
||||
data.key = DATA_KEY_REFERENCE;
|
||||
result.add(data);
|
||||
// Add fragment title if we are showing this fragment
|
||||
if (res.getBoolean(R.bool.config_show_wifi_settings)) {
|
||||
SearchIndexableRaw data = new SearchIndexableRaw(context);
|
||||
data.title = res.getString(R.string.wifi_settings);
|
||||
data.screenTitle = res.getString(R.string.wifi_settings);
|
||||
data.keywords = res.getString(R.string.keywords_wifi);
|
||||
data.key = DATA_KEY_REFERENCE;
|
||||
result.add(data);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
Reference in New Issue
Block a user