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

Fix hiding of channel fields

Browse Source 
When channel is off

Test: atest
Bug: 132971502
Change-Id: I5772266e022e5ebb5dbf20f231ca30fad95e3db7
This commit is contained in:
Julia Reynolds
2019-05-20 14:03:07 -04:00
parent 76cf0dbddd
commit 72bdef0781
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,9 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
return false;
}
if (mChannelGroup != null) {
return !mChannelGroup.isBlocked();
if (mChannelGroup.isBlocked()) {
return false;
}
}
if (mChannel != null) {
return mChannel.getImportance() != IMPORTANCE_NONE;

4
tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
View File

@@ -105,10 +105,12 @@ public class NotificationPreferenceControllerTest {
@Test
public void isAvailable_notIfChannelBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannelGroup group = mock(NotificationChannelGroup.class);
when(group.isBlocked()).thenReturn(false);
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
mController.onResume(appRow, channel, null, null);
mController.onResume(appRow, channel, group, null);
assertFalse(mController.isAvailable());
}