Merge "Allow lines to be highlighted on managed service pages."
This commit is contained in:
committed by
Android (Google) Code Review
commit
3487c1633b
@@ -137,6 +137,7 @@ public class ZenAccessSettings extends EmptyTextSettings {
|
||||
final String pkg = app.packageName;
|
||||
final CharSequence label = app.loadLabel(mPkgMan);
|
||||
final SwitchPreference pref = new AppSwitchPreference(getPrefContext());
|
||||
pref.setKey(pkg);
|
||||
pref.setPersistent(false);
|
||||
pref.setIcon(app.loadIcon(mPkgMan));
|
||||
pref.setTitle(label);
|
||||
|
@@ -143,8 +143,10 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
|
||||
final boolean enable = (boolean) newValue;
|
||||
return setEnabled(cn, summary, enable);
|
||||
});
|
||||
pref.setKey(cn.flattenToString());
|
||||
screen.addPreference(pref);
|
||||
}
|
||||
highlightPreferenceIfNeeded();
|
||||
}
|
||||
|
||||
private int getCurrentUser(int managedProfileId) {
|
||||
|
Reference in New Issue
Block a user