Merge "Add Settings toggle for Wi-Fi Wakeup." (94b86a4d) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+6 −2

Original line number	Diff line number	Diff line
		@@ -1582,9 +1582,13 @@
		<!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
		<string name="wifi_in_airplane_mode">In Airplane mode</string>
		<!-- Checkbox title for option to notify user when open networks are nearby -->
		<string name="wifi_notify_open_networks">Network notification</string>
		<string name="wifi_notify_open_networks">Open network notification</string>
		<!-- Checkbox summary for option to notify user when open networks are nearby [CHAR LIMIT=60]-->
		<string name="wifi_notify_open_networks_summary">Notify whenever a public network is available</string>
		<string name="wifi_notify_open_networks_summary">Notify whenever a high quality open network is available</string>
		<!-- Checkbox title for option to enable Wi-Fi when saved networks are nearby -->
		<string name="wifi_wakeup">Turn Wi\u2011Fi back on</string>
		<!-- Checkbox summary for option to enable Wi-Fi when saved networks are nearby [CHAR LIMIT=60]-->
		<string name="wifi_wakeup_summary">Automatically turn on Wi\u2011Fi near saved networks</string>
		<!-- Checkbox title for option to toggle poor network detection -->
		<string name="wifi_poor_network_detection">Avoid poor connections</string>
		<!-- Checkbox summary for option to toggle poor network detection -->

res/xml/wifi_configure_settings.xml

+10 −5

Original line number	Diff line number	Diff line
		@@ -23,11 +23,6 @@
		android:fragment="com.android.settings.wifi.SavedAccessPointsWifiSettings" />

		<!-- android:dependency="enable_wifi" -->
		<SwitchPreference
		android:key="notify_open_networks"
		android:title="@string/wifi_notify_open_networks"
		android:summary="@string/wifi_notify_open_networks_summary" />

		<ListPreference
		android:key="sleep_policy"
		android:title="@string/wifi_setting_sleep_policy_title"
		@@ -39,6 +34,16 @@
		android:title="@string/networking_allow_recommendations_title"
		android:summary="@string/networking_allow_recommendations_summary"/>

		<SwitchPreference
		android:key="notify_open_networks"
		android:title="@string/wifi_notify_open_networks"
		android:summary="@string/wifi_notify_open_networks_summary" />

		<SwitchPreference
		android:key="enable_wifi_wakeup"
		android:title="@string/wifi_wakeup"
		android:summary="@string/wifi_wakeup_summary" />

		<SwitchPreference
		android:key="wifi_cellular_data_fallback"
		android:title="@string/wifi_cellular_data_fallback_title"

src/com/android/settings/wifi/ConfigureWifiSettings.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -61,9 +61,10 @@ public class ConfigureWifiSettings extends DashboardFragment {
		final List<PreferenceController> controllers = new ArrayList<>();
		controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), mWifiManager));
		controllers.add(new SavedNetworkPreferenceController(context, mWifiManager));
		controllers.add(new NotifyOpenNetworksPreferenceController(context, mWifiManager));
		controllers.add(new CellularFallbackPreferenceController(context));
		controllers.add(new AllowRecommendationPreferenceController(context));
		controllers.add(new NotifyOpenNetworksPreferenceController(context, getLifecycle()));
		controllers.add(new WifiWakeupPreferenceController(context, getLifecycle()));
		controllers.add(new WifiSleepPolicyPreferenceController(context));
		return controllers;
		}

src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java

+64 −6

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}
		}

src/com/android/settings/wifi/WifiWakeupPreferenceController.java

0 → 100644

+133 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.wifi;

		import android.content.ContentResolver;
		import android.content.Context;
		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 the Wi-Fi Wakeup feature should be enabled.
		*/
		public class WifiWakeupPreferenceController extends PreferenceController implements
		LifecycleObserver, OnResume, OnPause {

		private static final String KEY_ENABLE_WIFI_WAKEUP = "enable_wifi_wakeup";
		private SettingObserver mSettingObserver;

		public WifiWakeupPreferenceController(Context context, Lifecycle lifecycle) {
		super(context);
		lifecycle.addObserver(this);
		}

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		mSettingObserver = new SettingObserver(screen.findPreference(KEY_ENABLE_WIFI_WAKEUP));
		}

		@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
		public boolean isAvailable() {
		return true;
		}

		@Override
		public boolean handlePreferenceTreeClick(Preference preference) {
		if (!TextUtils.equals(preference.getKey(), KEY_ENABLE_WIFI_WAKEUP)) {
		return false;
		}
		if (!(preference instanceof SwitchPreference)) {
		return false;
		}
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.WIFI_WAKEUP_ENABLED,
		((SwitchPreference) preference).isChecked() ? 1 : 0);
		return true;
		}

		@Override
		public String getPreferenceKey() {
		return KEY_ENABLE_WIFI_WAKEUP;
		}

		@Override
		public void updateState(Preference preference) {
		if (!(preference instanceof SwitchPreference)) {
		return;
		}
		final SwitchPreference enableWifiWakeup = (SwitchPreference) preference;
		enableWifiWakeup.setChecked(Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1);
		enableWifiWakeup.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);
		}
		}
		}
		}