Remove wifi/bt restrictions choice for limited users

Bug: 8631653

Make "Unknown sources" visible but disabled if restricted for limited user.
Bug: 8629605

Also show the restriction name as the dialog title in the picker.

Change-Id: I8d6ea3571bcc4372347cad6a2c982f35afa7cc09
This commit is contained in:
Amith Yamasani
2013-04-16 15:39:47 -07:00
parent 1a72d9c49b
commit e11a346f1f
3 changed files with 9 additions and 15 deletions

View File

@@ -31,22 +31,22 @@ import java.util.ArrayList;
public class RestrictionUtils {
public static final String [] sRestrictionKeys = {
UserManager.DISALLOW_CONFIG_WIFI,
UserManager.DISALLOW_CONFIG_BLUETOOTH,
// UserManager.DISALLOW_CONFIG_WIFI,
// UserManager.DISALLOW_CONFIG_BLUETOOTH,
UserManager.DISALLOW_SHARE_LOCATION,
UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES
};
public static final int [] sRestrictionTitles = {
R.string.restriction_wifi_config_title,
R.string.restriction_bluetooth_config_title,
// R.string.restriction_wifi_config_title,
// R.string.restriction_bluetooth_config_title,
R.string.restriction_location_enable_title,
R.string.install_applications
};
public static final int [] sRestrictionDescriptions = {
R.string.restriction_wifi_config_summary,
R.string.restriction_bluetooth_config_summary,
// R.string.restriction_wifi_config_summary,
// R.string.restriction_bluetooth_config_summary,
R.string.restriction_location_enable_summary,
R.string.install_unknown_applications
};