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

Commit b0f3f6ce authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Sometimes there's no advanced settings" into oc-mr1-dev 

am: a639e322

Change-Id: Ib737041715e76a70d2c2fc703100cebbc95a2501
parents 11974385 a639e322

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

+6 −3
Original line number Diff line number Diff line
@@ -374,7 +374,9 @@ public class ChannelNotificationSettings extends NotificationSettingsBase { 
    }



    void updateDependents(boolean banned) {

        PreferenceGroup parent;

        if (mShowLegacyChannelConfig) {

            parent = getPreferenceScreen();

            setVisible(mImportanceToggle, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));

        } else {

            setVisible(mAdvanced, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
@@ -383,12 +385,13 @@ public class ChannelNotificationSettings extends NotificationSettingsBase { 
                    NotificationManager.IMPORTANCE_DEFAULT) && canPulseLight());

            setVisible(mVibrate, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT));

            setVisible(mRingtone, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT));

            parent = mAdvanced;

        }

        setVisible(mAdvanced, mBadge, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));

        setVisible(mAdvanced, mPriority, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)

        setVisible(parent, mBadge, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));

        setVisible(parent, mPriority, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)

                || (checkCanBeVisible(NotificationManager.IMPORTANCE_LOW)

                && mDndVisualEffectsSuppressed));

        setVisible(mAdvanced, mVisibilityOverride, isLockScreenSecure()

        setVisible(parent, mVisibilityOverride, isLockScreenSecure()

                &&checkCanBeVisible(NotificationManager.IMPORTANCE_LOW));

        setVisible(mBlockedDesc, mChannel.getImportance() == IMPORTANCE_NONE);

        if (mAppLink != null) {