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

Merge "Allow lines to be highlighted on managed service pages."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-17 22:08:26 +00:00
committed by Android (Google) Code Review
parent 2d4f581f39 5038698a5f
commit 3487c1633b
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/notification/ZenAccessSettings.java
View File

@@ -137,6 +137,7 @@ public class ZenAccessSettings extends EmptyTextSettings {
final String pkg = app.packageName; final String pkg = app.packageName;
final CharSequence label = app.loadLabel(mPkgMan); final CharSequence label = app.loadLabel(mPkgMan);
final SwitchPreference pref = new AppSwitchPreference(getPrefContext()); final SwitchPreference pref = new AppSwitchPreference(getPrefContext());
pref.setKey(pkg);
pref.setPersistent(false); pref.setPersistent(false);
pref.setIcon(app.loadIcon(mPkgMan)); pref.setIcon(app.loadIcon(mPkgMan));
pref.setTitle(label); pref.setTitle(label);

2
src/com/android/settings/utils/ManagedServiceSettings.java
View File

@@ -143,8 +143,10 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
final boolean enable = (boolean) newValue; final boolean enable = (boolean) newValue;
return setEnabled(cn, summary, enable); return setEnabled(cn, summary, enable);
}); });
pref.setKey(cn.flattenToString());
screen.addPreference(pref); screen.addPreference(pref);
} }
highlightPreferenceIfNeeded();
} }
private int getCurrentUser(int managedProfileId) { private int getCurrentUser(int managedProfileId) {