Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respect user restrictions about adding/removing accounts, sideloading

Browse Source 
Hide or disable options in the settings app when the user is restricted from
making changes.

Remove "Add account" button from Settings menu, and "remove account" option from menu in AccountSyncSettings.
Remove sideloading checkbox in SecuritySettings.

Also handle replacement of UserManager.isShareLocationToggleAllowed() with hasUserRestriction, which takes a restriction key string.

Change-Id: I34c74fd5aed8956ba00f92e3d3c657b608454dfe
This commit is contained in:
Maggie Benthall
2013-03-14 17:41:27 -04:00
parent 05d67f62b7
commit 0c5a401a58
6 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/LocationSettings.java
View File

@@ -96,7 +96,7 @@ public class LocationSettings extends SettingsPreferenceFragment
// Only enable these controls if this user is allowed to change location
// sharing settings.
final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
boolean isToggleAllowed = um.isLocationSharingToggleAllowed();
boolean isToggleAllowed = !um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
if (mLocationAccess != null) mLocationAccess.setEnabled(isToggleAllowed);
if (mNetwork != null) mNetwork.setEnabled(isToggleAllowed);
if (mGps != null) mGps.setEnabled(isToggleAllowed);
@@ -117,6 +117,7 @@ public class LocationSettings extends SettingsPreferenceFragment
if (mSettingsObserver == null) {
mSettingsObserver = new Observer() {
@Override
public void update(Observable o, Object arg) {
updateLocationToggles();
}
@@ -131,13 +132,13 @@ public class LocationSettings extends SettingsPreferenceFragment
final ContentResolver cr = getContentResolver();
final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
if (preference == mNetwork) {
if (um.isLocationSharingToggleAllowed()) {
if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
Settings.Secure.setLocationProviderEnabled(cr,
LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
}
} else if (preference == mGps) {
boolean enabled = mGps.isChecked();
if (um.isLocationSharingToggleAllowed()) {
if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
Settings.Secure.setLocationProviderEnabled(cr,
LocationManager.GPS_PROVIDER, enabled);
if (mAssistedGps != null) {
@@ -186,7 +187,7 @@ public class LocationSettings extends SettingsPreferenceFragment
/** Enable or disable all providers when the master toggle is changed. */
private void onToggleLocationAccess(boolean checked) {
final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
if (! um.isLocationSharingToggleAllowed()) {
if (um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
return;
}
final ContentResolver cr = getContentResolver();