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

Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-11 00:05:48 +00:00
committed by Android (Google) Code Review
parent cf162d5354 a99b86c56a
commit 25d1848e5f
4 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -853,11 +853,18 @@ public class WifiSettings extends RestrictedSettingsFragment
private void setAdditionalSettingsSummaries() {
mAdditionalSettingsPreferenceCategory.addPreference(mConfigureWifiSettingsPreference);
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));
final int defaultWakeupAvailable = getResources().getInteger(
com.android.internal.R.integer.config_wifi_wakeup_available);
boolean wifiWakeupAvailable = Settings.Global.getInt(
getContentResolver(), Settings.Global.WIFI_WAKEUP_AVAILABLE, defaultWakeupAvailable)
== 1;
if (wifiWakeupAvailable) {
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);

5
src/com/android/settings/wifi/WifiWakeupPreferenceController.java
View File

@@ -70,7 +70,10 @@ public class WifiWakeupPreferenceController extends PreferenceController impleme
@Override
public boolean isAvailable() {
return true;
final int defaultValue = mContext.getResources().getInteger(
com.android.internal.R.integer.config_wifi_wakeup_available);
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_WAKEUP_AVAILABLE, defaultValue) == 1;
}
@Override