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

2 files changed, 8 insertions, 6 deletions

diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 4e6e5ded4..8b93417b2 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -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:
diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java
index 8b675a554..241395b0e 100644
--- a/src/com/android/settings/users/RestrictionUtils.java
+++ b/src/com/android/settings/users/RestrictionUtils.java
@@ -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
     };