commit 42d2fda721e7bb8fd91276ceeade757d1e5a2c72
author Julia Reynolds <juliacr@google.com> Tue Jul 12 14:03:12 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 12 14:03:12 2016 +0000
tree fd87560dcada398849bb74fe60e50ff4f3195b19
parent 9c26c9dba6998fda4b3af27e315220b8bec6e0c5
parent 2c1eb80b1ddaf125b0c1b0765e7713fa4e97b867

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

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

diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index f718b3c..e7f15e5 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -33,10 +33,8 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.AppHeader;
 import com.android.settings.R;
-import com.android.settings.applications.LayoutPreference;
 import com.android.settings.notification.NotificationBackend.AppRow;
 import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.RestrictedPreference;
 
 
 import java.util.List;
@@ -113,7 +111,8 @@
             mSilent.setChecked(importance == Ranking.IMPORTANCE_LOW);
         }
         setVisible(mPriority, checkCanBeVisible(Ranking.IMPORTANCE_DEFAULT, importance)
-                && !mDndVisualEffectsSuppressed);
+                || (checkCanBeVisible(Ranking.IMPORTANCE_LOW, importance)
+                        && mDndVisualEffectsSuppressed));
         setVisible(mVisibilityOverride,
                 checkCanBeVisible(Ranking.IMPORTANCE_MIN, importance) && lockscreenSecure);
     }