Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e11a346f authored by Amith Yamasani's avatar Amith Yamasani
Browse files

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
parent 1a72d9c4

src/com/android/settings/SecuritySettings.java

+1 −9
Original line number Diff line number Diff line
@@ -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);

            }

        }



        // Package verification, only visible to primary user and if enabled

        mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS);

src/com/android/settings/users/AppRestrictionsFragment.java

+2 −0
Original line number Diff line number Diff line
@@ -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:

src/com/android/settings/users/RestrictionUtils.java

+6 −6
Original line number Diff line number Diff line
@@ -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

    };