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

Commit 9f4ad67f authored by Daniel U's avatar Daniel U Committed by Android (Google) Code Review
Browse files

Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev

parents f103d108 6e556092
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -75,9 +75,14 @@ public class ConfigureNotificationSettings extends SettingsPreferenceFragment {
        mContext = getActivity();
        mProfileChallengeUserId = Utils.getManagedProfileId(
                UserManager.get(mContext), UserHandle.myUserId());
        mSecure = new LockPatternUtils(getActivity()).isSecure(UserHandle.myUserId());

        final LockPatternUtils utils = new LockPatternUtils(getActivity());
        final boolean isUnified =
                !utils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId);

        mSecure = utils.isSecure(UserHandle.myUserId());
        mSecureProfile = (mProfileChallengeUserId != UserHandle.USER_NULL)
                && new LockPatternUtils(getActivity()).isSecure(mProfileChallengeUserId);
                && (utils.isSecure(mProfileChallengeUserId) || (isUnified && mSecure));

        addPreferencesFromResource(R.xml.configure_notification_settings);