Add Settings toggle for Wi-Fi Wakeup.
- Added switch toggle to Configure Wi-Fi Settings for Wi-Fi Wakeup - Disable Wi-Fi Open Networks Notifications and Wi-Fi Wakeup toggles if NETWORK_RECOMMENDATIONS_ENABLED is disabled Test: make -j40 RunSettingsRoboTests Bug: 33224845 Change-Id: I2a52c5d1e60f618aefa125c7806fa95ca19a0ca9
This commit is contained in:
@@ -16,27 +16,56 @@
|
||||
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.database.ContentObserver;
|
||||
import android.net.Uri;
|
||||
import android.os.Handler;
|
||||
import android.provider.Settings;
|
||||
import android.support.v14.preference.SwitchPreference;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.lifecycle.Lifecycle;
|
||||
import com.android.settings.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settings.core.lifecycle.events.OnPause;
|
||||
import com.android.settings.core.lifecycle.events.OnResume;
|
||||
|
||||
/**
|
||||
* {@link PreferenceController} that controls whether we should notify user when open network is
|
||||
* available.
|
||||
*/
|
||||
public class NotifyOpenNetworksPreferenceController extends PreferenceController {
|
||||
public class NotifyOpenNetworksPreferenceController extends PreferenceController implements
|
||||
LifecycleObserver, OnResume, OnPause {
|
||||
|
||||
private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
|
||||
private final WifiManager mWifiManager;
|
||||
private SettingObserver mSettingObserver;
|
||||
|
||||
public NotifyOpenNetworksPreferenceController(Context context, WifiManager wifiManager) {
|
||||
public NotifyOpenNetworksPreferenceController(Context context, Lifecycle lifecycle) {
|
||||
super(context);
|
||||
mWifiManager = wifiManager;
|
||||
lifecycle.addObserver(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
mSettingObserver = new SettingObserver(screen.findPreference(KEY_NOTIFY_OPEN_NETWORKS));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
if (mSettingObserver != null) {
|
||||
mSettingObserver.register(mContext.getContentResolver(), true /* register */);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
if (mSettingObserver != null) {
|
||||
mSettingObserver.register(mContext.getContentResolver(), false /* register */);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -71,6 +100,35 @@ public class NotifyOpenNetworksPreferenceController extends PreferenceController
|
||||
final SwitchPreference notifyOpenNetworks = (SwitchPreference) preference;
|
||||
notifyOpenNetworks.setChecked(Settings.Global.getInt(mContext.getContentResolver(),
|
||||
Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
|
||||
notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
|
||||
notifyOpenNetworks.setEnabled(Settings.Global.getInt(mContext.getContentResolver(),
|
||||
Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0) == 1);
|
||||
}
|
||||
|
||||
class SettingObserver extends ContentObserver {
|
||||
private final Uri NETWORK_RECOMMENDATIONS_ENABLED_URI =
|
||||
Settings.Global.getUriFor(Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED);
|
||||
|
||||
private final Preference mPreference;
|
||||
|
||||
public SettingObserver(Preference preference) {
|
||||
super(new Handler());
|
||||
mPreference = preference;
|
||||
}
|
||||
|
||||
public void register(ContentResolver cr, boolean register) {
|
||||
if (register) {
|
||||
cr.registerContentObserver(NETWORK_RECOMMENDATIONS_ENABLED_URI, false, this);
|
||||
} else {
|
||||
cr.unregisterContentObserver(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onChange(boolean selfChange, Uri uri) {
|
||||
super.onChange(selfChange, uri);
|
||||
if (NETWORK_RECOMMENDATIONS_ENABLED_URI.equals(uri)) {
|
||||
updateState(mPreference);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user