PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove wifi/bt restrictions choice for limited users

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/users/AppRestrictionsFragment.java
View File

@@ -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: