PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julia Reynolds
2016-07-12 14:03:12 +00:00
committed by Android (Google) Code Review
parent 9c26c9dba6 2c1eb80b1d
commit 42d2fda721
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -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);
} }