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

Commit ae35c38f authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Show 'on the lockscreen' setting in more contexts." into nyc-dev

parents d76c723e 21fd269e

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

+7 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Intent; 
import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.ResolveInfo;

import android.content.pm.UserInfo;

import android.os.Bundle;

import android.os.UserHandle;

import android.service.notification.NotificationListenerService.Ranking;
@@ -101,8 +102,12 @@ public class AppNotificationSettings extends NotificationSettingsBase { 


    @Override

    protected void updateDependents(int importance) {

        final boolean lockscreenSecure = new LockPatternUtils(getActivity()).isSecure(

                UserHandle.myUserId());

        LockPatternUtils utils = new LockPatternUtils(getActivity());

        boolean lockscreenSecure = utils.isSecure(UserHandle.myUserId());

        UserInfo parentUser = mUm.getProfileParent(UserHandle.myUserId());

        if (parentUser != null){

            lockscreenSecure |= utils.isSecure(parentUser.id);

        }



        if (getPreferenceScreen().findPreference(mBlock.getKey()) != null) {

            setVisible(mSilent, checkCanBeVisible(Ranking.IMPORTANCE_MIN, importance));

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

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ public class ImportanceSeekBarPreference extends SeekBarPreference implements 
        mSeekBar.setThumbTintList(sliderTint);



        if (mAutoOn) {

            setProgress(NotificationListenerService.Ranking.IMPORTANCE_DEFAULT);

            mSummary = getProgressSummary(

                    NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED);

        }

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

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.service.notification.NotificationListenerService.Ranking;

import android.support.v7.preference.DropDownPreference;
@@ -54,6 +55,7 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen 
    protected static final String KEY_SILENT = "silent";



    protected PackageManager mPm;

    protected UserManager mUm;

    protected final NotificationBackend mBackend = new NotificationBackend();

    protected Context mContext;

    protected boolean mCreated;
@@ -94,6 +96,7 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen 
        }



        mPm = getPackageManager();

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



        mPkg = args != null && args.containsKey(AppInfoBase.ARG_PACKAGE_NAME)

                ? args.getString(AppInfoBase.ARG_PACKAGE_NAME)