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 
am: b5d6ba4caa

Change-Id: I1fd03d275d5a816bea85a71a671a0fc84e15db3b
This commit is contained in:
Julia Reynolds
2019-04-10 08:49:24 -07:00
committed by android-build-merger
parent 45783f9193 b5d6ba4caa
commit b6ea5c437a
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;
}