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 
am: 42d2fda721

Change-Id: I34ad6825441eb154fb767e24857119561b2855ed
This commit is contained in:
Julia Reynolds
2016-07-12 14:08:26 +00:00
committed by android-build-merger
parent e7ab5e6a02 42d2fda721
commit 8f98525de1
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.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 @@ public class AppNotificationSettings extends NotificationSettingsBase {
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);
}