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

Commit 895796ae authored by Esteban Talavera's avatar Esteban Talavera Committed by android-build-merger
Browse files

Merge "Show when work profile notifications are blocked for listener" into oc-dev 

am: 607b4d05

Change-Id: I7181d474d41c6574eea49f5fc65f06a9b75d2b1e
parents d8b6244d 607b4d05

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -6604,6 +6604,10 @@ 
    <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->

    <string name="manage_notification_access_title">Notification access</string>









    <!-- Notification Access section: Indicates that the work profile admin doesn't allow this









         notification listener to access work profile notifications [CHAR LIMIT=100] -->









    <string name="work_profile_notification_access_blocked_summary">Access to work profile notifications is blocked</string>

















    <!-- Summary of preference to manage notification listeners, when none are enabled -->









    <string name="manage_notification_access_summary_zero">Apps cannot read notifications</string>

































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



+14
−2






























Original line number
Diff line number
Diff line







@@ -19,8 +19,8 @@ package com.android.settings.utils;







import android.annotation.Nullable;









import android.app.AlertDialog;









import android.app.Dialog;









import android.app.DialogFragment;









import android.app.Fragment;









import android.app.admin.DevicePolicyManager;









import android.content.ComponentName;









import android.content.Context;









import android.content.DialogInterface;








@@ -28,15 +28,17 @@ import android.content.pm.PackageItemInfo;







import android.content.pm.PackageManager;









import android.content.pm.ServiceInfo;









import android.os.Bundle;









import android.os.UserHandle;









import android.os.UserManager;









import android.support.v14.preference.SwitchPreference;









import android.support.v7.preference.Preference;









import android.support.v7.preference.Preference.OnPreferenceChangeListener;









import android.support.v7.preference.PreferenceScreen;









import android.view.View;









import android.widget.TextView;



















import com.android.internal.logging.nano.MetricsProto;









import com.android.settings.R;









import com.android.settings.Utils;









import com.android.settings.core.instrumentation.InstrumentedDialogFragment;









import com.android.settings.notification.EmptyTextSettings;


















@@ -48,6 +50,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {

















    protected Context mContext;









    private PackageManager mPM;









    private DevicePolicyManager mDpm;









    protected ServiceListing mServiceListing;



















    abstract protected Config getConfig();








@@ -62,6 +65,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {

















        mContext = getActivity();









        mPM = mContext.getPackageManager();









        mDpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);









        mServiceListing = new ServiceListing(mContext, mConfig);









        mServiceListing.addCallback(new ServiceListing.Callback() {









            @Override








@@ -92,6 +96,9 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {







    }



















    private void updateList(List<ServiceInfo> services) {









        UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);









        final int managedProfileId = Utils.getManagedProfileId(um, UserHandle.myUserId());



















        final PreferenceScreen screen = getPreferenceScreen();









        screen.removeAll();









        Collections.sort(services, new PackageItemInfo.DisplayNameComparator(mPM));








@@ -103,6 +110,11 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {







            pref.setIcon(service.loadIcon(mPM));









            pref.setTitle(title);









            pref.setChecked(mServiceListing.isEnabled(cn));









            if (managedProfileId != UserHandle.USER_NULL









                    && !mDpm.isNotificationListenerServicePermitted(









                            service.packageName, managedProfileId)) {









                pref.setSummary(R.string.work_profile_notification_access_blocked_summary);









            }









            pref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {









                @Override









                public boolean onPreferenceChange(Preference preference, Object newValue) {