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

15
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -41,6 +41,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
private static final String TAG = "ConfigureWifiSettings";
public static final String KEY_IP_ADDRESS = "current_ip_address";
public static final int WIFI_WAKEUP_REQUEST_CODE = 600;
private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
@@ -71,7 +72,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context);
mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context, this);
mUseOpenWifiPreferenceController = new UseOpenWifiPreferenceController(context, this,
getLifecycle());
final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
@@ -87,10 +88,16 @@ public class ConfigureWifiSettings extends DashboardFragment {
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (mUseOpenWifiPreferenceController == null ||
!mUseOpenWifiPreferenceController.onActivityResult(requestCode, resultCode)) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == WIFI_WAKEUP_REQUEST_CODE && mWifiWakeupPreferenceController != null) {
mWifiWakeupPreferenceController.onActivityResult(requestCode, resultCode);
return;
}
if (resultCode == UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY
&& mUseOpenWifiPreferenceController == null) {
mUseOpenWifiPreferenceController.onActivityResult(requestCode, resultCode);
return;
}
super.onActivityResult(requestCode, resultCode, data);
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =