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

Merge "Fix visibility of settings on channel page" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-10 15:31:35 +00:00
committed by Android (Google) Code Review
parent 62e5be9797 2290e284ec
commit b5d6ba4caa
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/ImportancePreferenceController.java
View File

@@ -50,12 +50,18 @@ public class ImportancePreferenceController extends NotificationPreferenceContro
if (mAppRow == null) {
return false;
}
if (mAppRow.banned) {
return false;
}
if (mChannel == null) {
return false;
}
if (isDefaultChannel()) {
return false;
}
if (mChannelGroup != null && mChannelGroup.isBlocked()) {
return false;
}
return true;
}

6
src/com/android/settings/notification/NotificationPreferenceController.java
View File

@@ -73,12 +73,12 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
if (mAppRow.banned) {
return false;
}
if (mChannel != null) {
return mChannel.getImportance() != IMPORTANCE_NONE;
}
if (mChannelGroup != null) {
return !mChannelGroup.isBlocked();
}
if (mChannel != null) {
return mChannel.getImportance() != IMPORTANCE_NONE;
}
return true;
}