PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Populate summary for top level wifi picker options"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-27 15:48:54 +00:00
committed by Android (Google) Code Review
parent 0ba5805455 04cae3b66a
commit f7fb763ed5
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -815,8 +815,17 @@ public class WifiSettings extends RestrictedSettingsFragment
return; return;
} }
mAdditionalSettingsPreferenceCategory.addPreference(mConfigureWifiSettingsPreference); mAdditionalSettingsPreferenceCategory.addPreference(mConfigureWifiSettingsPreference);
if (mWifiTracker.doSavedNetworksExist()) { boolean wifiWakeupEnabled = Settings.Global.getInt(
getContentResolver(), Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1;
mConfigureWifiSettingsPreference.setSummary(getString(wifiWakeupEnabled
? R.string.wifi_configure_settings_preference_summary_wakeup_on
: R.string.wifi_configure_settings_preference_summary_wakeup_off));
int numSavedNetworks = mWifiTracker.getNumSavedNetworks();
if (numSavedNetworks > 0) {
mAdditionalSettingsPreferenceCategory.addPreference(mSavedNetworksPreference); mAdditionalSettingsPreferenceCategory.addPreference(mSavedNetworksPreference);
mSavedNetworksPreference.setSummary(
getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
numSavedNetworks, numSavedNetworks));
} else { } else {
mAdditionalSettingsPreferenceCategory.removePreference(mSavedNetworksPreference); mAdditionalSettingsPreferenceCategory.removePreference(mSavedNetworksPreference);
} }