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

Update auto wi-fi to prompt user for permissions

Browse Source 
This CL makes it so that auto wi-fi will correctly prompt users
to enable the correct permissions before allowing them to turn
on the setting. Additionally it provides users with important
information regarding each setting.

Bug: 67070896
Test: Robotests
Change-Id: Ieddfa421be6e45ce69f3d6048ae051a7e3ce4c76
This commit is contained in:
Salvador Martinez
2018-03-19 08:41:32 -07:00
parent 861bf93502
commit 2f5292454b
9 changed files with 416 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,15 @@
package com.android.settings.wifi;
import static com.android.settings.wifi.ConfigureWifiSettings.WIFI_WAKEUP_REQUEST_CODE;
import android.app.Fragment;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.location.LocationManager;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -25,24 +32,37 @@ import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.utils.AnnotationSpan;
import com.android.settingslib.core.AbstractPreferenceController;
/**
* {@link PreferenceControllerMixin} that controls whether the Wi-Fi Wakeup feature should be
* enabled.
*/
public class WifiWakeupPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
public class WifiWakeupPreferenceController extends AbstractPreferenceController {
private static final String TAG = "WifiWakeupPrefController";
private static final String KEY_ENABLE_WIFI_WAKEUP = "enable_wifi_wakeup";
public WifiWakeupPreferenceController(Context context) {
private final Fragment mFragment;
@VisibleForTesting
SwitchPreference mPreference;
@VisibleForTesting
LocationManager mLocationManager;
public WifiWakeupPreferenceController(Context context, DashboardFragment fragment) {
super(context);
mFragment = fragment;
mLocationManager = (LocationManager) context.getSystemService(Service.LOCATION_SERVICE);
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = (SwitchPreference) screen.findPreference(KEY_ENABLE_WIFI_WAKEUP);
updateState(mPreference);
}
@Override
@@ -58,9 +78,19 @@ public class WifiWakeupPreferenceController extends AbstractPreferenceController
if (!(preference instanceof SwitchPreference)) {
return false;
}
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.WIFI_WAKEUP_ENABLED,
((SwitchPreference) preference).isChecked() ? 1 : 0);
if (!mLocationManager.isLocationEnabled()) {
final Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
mFragment.startActivity(intent);
} else if (getWifiWakeupEnabled()) {
setWifiWakeupEnabled(false);
} else if (!getWifiScanningEnabled()) {
showScanningDialog();
} else {
setWifiWakeupEnabled(true);
}
updateState(mPreference);
return true;
}
@@ -76,17 +106,51 @@ public class WifiWakeupPreferenceController extends AbstractPreferenceController
}
final SwitchPreference enableWifiWakeup = (SwitchPreference) preference;
enableWifiWakeup.setChecked(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1);
boolean wifiScanningEnabled = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1;
enableWifiWakeup.setEnabled(wifiScanningEnabled);
if (wifiScanningEnabled) {
enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary);
enableWifiWakeup.setChecked(getWifiWakeupEnabled()
&& getWifiScanningEnabled()
&& mLocationManager.isLocationEnabled());
if (!mLocationManager.isLocationEnabled()) {
preference.setSummary(getNoLocationSummary());
} else {
enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary_scanning_disabled);
preference.setSummary(R.string.wifi_wakeup_summary);
}
}
@VisibleForTesting CharSequence getNoLocationSummary() {
AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo("link", null);
CharSequence locationText = mContext.getText(R.string.wifi_wakeup_summary_no_location);
return AnnotationSpan.linkify(locationText, linkInfo);
}
public void onActivityResult(int requestCode, int resultCode) {
if (requestCode != WIFI_WAKEUP_REQUEST_CODE) {
return;
}
if (mLocationManager.isLocationEnabled()) {
setWifiWakeupEnabled(true);
}
updateState(mPreference);
}
private boolean getWifiScanningEnabled() {
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1;
}
private void showScanningDialog() {
final WifiScanningRequiredFragment dialogFragment =
WifiScanningRequiredFragment.newInstance();
dialogFragment.setTargetFragment(mFragment, WIFI_WAKEUP_REQUEST_CODE /* requestCode */);
dialogFragment.show(mFragment.getFragmentManager(), TAG);
}
private boolean getWifiWakeupEnabled() {
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1;
}
private void setWifiWakeupEnabled(boolean enabled) {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_WAKEUP_ENABLED,
enabled ? 1 : 0);
}
}