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

Make auto Wi-Fi summary text consistent with feature availability.

Browse Source 
"Turn Wi-Fi on automatically" feature is disabled when airplane mode or
battery saver mode is enabled, when Wi-Fi scanning is disabled, or when
network recommendations are disabled / scorer unset. This change
captures these negative cases in the summary text.

Bug: 65085700
Test: make ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I2f2d22b5bef3ad03a28d34e79a27e6545cac557f
This commit is contained in:
Stephen Chen
2017-09-01 11:18:36 -07:00
parent d0275e53eb
commit 8ffcbccbce
4 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,13 +44,10 @@ public class WifiWakeupPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
private static final String KEY_ENABLE_WIFI_WAKEUP = "enable_wifi_wakeup";
private final NetworkScoreManagerWrapper mNetworkScoreManager;
private SettingObserver mSettingObserver;
public WifiWakeupPreferenceController(
Context context, Lifecycle lifecycle, NetworkScoreManagerWrapper networkScoreManager) {
public WifiWakeupPreferenceController(Context context, Lifecycle lifecycle) {
super(context);
mNetworkScoreManager = networkScoreManager;
lifecycle.addObserver(this);
}
@@ -116,11 +113,9 @@ public class WifiWakeupPreferenceController extends AbstractPreferenceController
boolean networkRecommendationsEnabled = Settings.Global.getInt(
mContext.getContentResolver(),
Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0) == 1;
boolean activeScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
enableWifiWakeup.setEnabled(
networkRecommendationsEnabled && wifiScanningEnabled && activeScorerSet);
enableWifiWakeup.setEnabled(networkRecommendationsEnabled && wifiScanningEnabled);
if (!activeScorerSet) {
if (!networkRecommendationsEnabled) {
enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary_scoring_disabled);
} else if (!wifiScanningEnabled) {
enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary_scanning_disabled);