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

User wifi separation feature.

Browse Source 
-Enable forget button for all users.

Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
This commit is contained in:
Sky Faber
2014-09-26 14:26:23 -07:00
committed by Vinit Deshpande
parent d7d604056b
commit ec4ba9b538
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.wifi;
import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID; import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.IpConfiguration; import android.net.IpConfiguration;
@@ -300,8 +299,7 @@ public class WifiConfigController implements TextWatcher,
addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false)); addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));
mView.findViewById(R.id.ip_fields).setVisibility(View.GONE); mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);
} }
if (mAccessPoint.networkId != INVALID_NETWORK_ID if (mAccessPoint.networkId != INVALID_NETWORK_ID) {
&& ActivityManager.getCurrentUser() == UserHandle.USER_OWNER) {
mConfigUi.setForgetButton(res.getString(R.string.wifi_forget)); mConfigUi.setForgetButton(res.getString(R.string.wifi_forget));
} }
} }

3
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -20,7 +20,6 @@ import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
import static android.os.UserManager.DISALLOW_CONFIG_WIFI; import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager;
import android.app.Dialog; import android.app.Dialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@@ -530,9 +529,7 @@ public class WifiSettings extends RestrictedSettingsFragment
menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect); menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
} }
if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) { if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
if (ActivityManager.getCurrentUser() == UserHandle.USER_OWNER) {
menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget); menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
}
menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify); menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
if (mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) { if (mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {