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

Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev

Browse Source
This commit is contained in:
Hall Liu
2020-03-19 21:06:54 +00:00
committed by Android (Google) Code Review
parent 6c95bb5cf6 45e4b8948c
commit 64e48c2061
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
View File

@@ -467,7 +467,7 @@ public class NotificationChannelSlice implements CustomSliceable {
return true; return true;
} }
return channel.isBlockableSystem() return channel.isBlockable()
|| channel.getImportance() == IMPORTANCE_NONE; || channel.getImportance() == IMPORTANCE_NONE;
} }

2
src/com/android/settings/notification/app/NotificationPreferenceController.java
View File

@@ -134,7 +134,7 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
return channel.getImportance() == IMPORTANCE_NONE; return channel.getImportance() == IMPORTANCE_NONE;
} }
return channel.isBlockableSystem() || !mAppRow.systemApp return channel.isBlockable() || !mAppRow.systemApp
|| channel.getImportance() == IMPORTANCE_NONE; || channel.getImportance() == IMPORTANCE_NONE;
} }
return false; return false;

2
tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
View File

@@ -200,7 +200,7 @@ public class BlockPreferenceControllerTest {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = true; appRow.systemApp = true;
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT); NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
channel.setBlockableSystem(true); channel.setBlockable(true);
mController.onResume(appRow, channel, null, null, null, null); mController.onResume(appRow, channel, null, null, null, null);
mController.updateState(mPreference); mController.updateState(mPreference);
assertTrue(mSwitch.isEnabled()); assertTrue(mSwitch.isEnabled());

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

@@ -236,7 +236,7 @@ public class NotificationPreferenceControllerTest {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = false; appRow.systemApp = false;
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.isBlockableSystem()).thenReturn(false); when(channel.isBlockable()).thenReturn(false);
mController.onResume(appRow, channel, null, null, null, null); mController.onResume(appRow, channel, null, null, null, null);
assertTrue(mController.isChannelBlockable()); assertTrue(mController.isChannelBlockable());
@@ -247,7 +247,7 @@ public class NotificationPreferenceControllerTest {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = true; appRow.systemApp = true;
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.isBlockableSystem()).thenReturn(false); when(channel.isBlockable()).thenReturn(false);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null, null, null); mController.onResume(appRow, channel, null, null, null, null);
@@ -259,7 +259,7 @@ public class NotificationPreferenceControllerTest {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = true; appRow.systemApp = true;
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.isBlockableSystem()).thenReturn(true); when(channel.isBlockable()).thenReturn(true);
mController.onResume(appRow, channel, null, null, null, null); mController.onResume(appRow, channel, null, null, null, null);
assertTrue(mController.isChannelBlockable()); assertTrue(mController.isChannelBlockable());
@@ -270,7 +270,7 @@ public class NotificationPreferenceControllerTest {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = true; appRow.systemApp = true;
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.isBlockableSystem()).thenReturn(false); when(channel.isBlockable()).thenReturn(false);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE); when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
mController.onResume(appRow, channel, null, null, null, null); mController.onResume(appRow, channel, null, null, null, null);