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

Commit 3487c163 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 2d4f581f 5038698a

src/com/android/settings/notification/ZenAccessSettings.java

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

src/com/android/settings/utils/ManagedServiceSettings.java

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