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

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

Merge "Correct logic for showing overide dnd field." into nyc-mr1-dev

parents 9c26c9db 2c1eb80b

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -33,10 +33,8 @@ import com.android.internal.logging.MetricsProto.MetricsEvent; 
import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.AppHeader;

import com.android.settings.AppHeader;

import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.applications.LayoutPreference;

import com.android.settings.notification.NotificationBackend.AppRow;

import com.android.settings.notification.NotificationBackend.AppRow;

import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.RestrictedPreference;









import java.util.List;

import java.util.List;
@@ -113,7 +111,8 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
            mSilent.setChecked(importance == Ranking.IMPORTANCE_LOW);

            mSilent.setChecked(importance == Ranking.IMPORTANCE_LOW);

        }

        }

        setVisible(mPriority, checkCanBeVisible(Ranking.IMPORTANCE_DEFAULT, importance)

        setVisible(mPriority, checkCanBeVisible(Ranking.IMPORTANCE_DEFAULT, importance)

                && !mDndVisualEffectsSuppressed);

                || (checkCanBeVisible(Ranking.IMPORTANCE_LOW, importance)

                        && mDndVisualEffectsSuppressed));

        setVisible(mVisibilityOverride,

        setVisible(mVisibilityOverride,

                checkCanBeVisible(Ranking.IMPORTANCE_MIN, importance) && lockscreenSecure);

                checkCanBeVisible(Ranking.IMPORTANCE_MIN, importance) && lockscreenSecure);

    }

    }