From 04cae3b66a794e37f56398727d3e0cbfd348ed8a Mon Sep 17 00:00:00 2001 From: Amin Shaikh Date: Thu, 23 Mar 2017 16:15:12 -0700 Subject: [PATCH] Populate summary for top level wifi picker options Screenshot: https://drive.google.com/file/d/0B8qSkjrtrXEPLTh0ZTRnMWFWX2M/view Bug: 36532777 Test: make RunSettingsRoboTests Change-Id: I9b364ecc4d71de484216f848c853db91a2a08fa7 --- src/com/android/settings/wifi/WifiSettings.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index ab1e04e9759..0484e00584a 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -810,8 +810,17 @@ public class WifiSettings extends RestrictedSettingsFragment return; } 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); + mSavedNetworksPreference.setSummary( + getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary, + numSavedNetworks, numSavedNetworks)); } else { mAdditionalSettingsPreferenceCategory.removePreference(mSavedNetworksPreference); }