Commit ed89cb87 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am e11a346f: Remove wifi/bt restrictions choice for limited users

* commit 'e11a346f':
  Remove wifi/bt restrictions choice for limited users
parents b7e49231 e11a346f
......@@ -260,15 +260,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
boolean isSideloadingAllowed =
!um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
// Side loading of apps.
if (isSideloadingAllowed) {
mToggleAppInstallation.setEnabled(isSideloadingAllowed);
} else {
if (deviceAdminCategory != null) {
deviceAdminCategory.removePreference(mToggleAppInstallation);
} else {
mToggleAppInstallation.setEnabled(false);
}
}
mToggleAppInstallation.setEnabled(isSideloadingAllowed);
// Package verification, only visible to primary user and if enabled
mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS);
......
......@@ -682,6 +682,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
((ListPreference)p).setEntryValues(entry.getChoiceValues());
((ListPreference)p).setEntries(entry.getChoiceEntries());
((ListPreference)p).setValue(value);
((ListPreference)p).setDialogTitle(entry.getTitle());
break;
case RestrictionEntry.TYPE_MULTI_SELECT:
p = new MultiSelectListPreference(context);
......@@ -693,6 +694,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
set.add(s);
}
((MultiSelectListPreference)p).setValues(set);
((MultiSelectListPreference)p).setDialogTitle(entry.getTitle());
break;
case RestrictionEntry.TYPE_NULL:
default:
......
......@@ -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
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment