Implement proper settings restrictions

Settings restrictions for limited users translate to user
restrictions specified in UserManager. Added required strings.
TODO: Add NFC restriction.

Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f
This commit is contained in:
Amith Yamasani
2013-03-31 17:50:55 -07:00
parent 732c80ff18
commit 2601cd9142
6 changed files with 177 additions and 210 deletions

View File

@@ -57,7 +57,6 @@ import com.android.settings.accounts.AuthenticatorHelper;
import com.android.settings.accounts.ManageAccountsSettings;
import com.android.settings.bluetooth.BluetoothEnabler;
import com.android.settings.bluetooth.BluetoothSettings;
import com.android.settings.users.RestrictionsReceiver;
import com.android.settings.wfd.WifiDisplaySettings;
import com.android.settings.wifi.WifiEnabler;
import com.android.settings.wifi.WifiSettings;
@@ -457,15 +456,6 @@ public class Settings extends PreferenceActivity
if (!showDev) {
target.remove(i);
}
} else if (id == R.id.application_settings) {
if (mAppRestrictions != null) {
for (RestrictionEntry entry : mAppRestrictions) {
if (entry.getKey().equals(RestrictionsReceiver.KEY_ENABLE_APPS)
&& !entry.getSelectedState()) {
target.remove(i);
}
}
}
} else if (id == R.id.account_add) {
if (um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
target.remove(i);