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

Merge "Hide block pref on non-configurable channels"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-08 14:44:16 +00:00
committed by Android (Google) Code Review
parent fd29d18ce6 9e2ec5fa07
commit fe805d7a41
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,11 +138,11 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
protected boolean isChannelBlockable() { protected boolean isChannelBlockable() {
if (mChannel != null && mAppRow != null) { if (mChannel != null && mAppRow != null) {
if (!mAppRow.systemApp) { if (!isChannelConfigurable()) {
return true; return mChannel.getImportance() == IMPORTANCE_NONE;
} }
return mChannel.isBlockableSystem() return mChannel.isBlockableSystem() || !mAppRow.systemApp
|| mChannel.getImportance() == IMPORTANCE_NONE; || mChannel.getImportance() == IMPORTANCE_NONE;
} }
return false; return false;

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

@@ -138,6 +138,7 @@ public class BlockPreferenceControllerTest {
public void testIsAvailable_nonSystemApp() { public void testIsAvailable_nonSystemApp() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = false; appRow.systemApp = false;
appRow.lockedChannelId = "not this";
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null); mController.onResume(appRow, channel, null, null);

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

@@ -261,6 +261,34 @@ public class NotificationPreferenceControllerTest {
assertTrue(mController.isChannelBlockable()); assertTrue(mController.isChannelBlockable());
} }
@Test
public void testIsChannelBlockable_notConfigurable() {
String sameId = "apples";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = false;
appRow.lockedChannelId = sameId;
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn(sameId);
when(channel.getImportance()).thenReturn(IMPORTANCE_DEFAULT);
mController.onResume(appRow, channel, null, null);
assertFalse(mController.isChannelBlockable());
}
@Test
public void testIsChannelBlockable_notConfigurableButBlocked() {
String sameId = "apples";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = false;
appRow.lockedChannelId = sameId;
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn(sameId);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
mController.onResume(appRow, channel, null, null);
assertTrue(mController.isChannelBlockable());
}
@Test @Test
public void testIsChannelGroupBlockable_nonSystemBlockable() { public void testIsChannelGroupBlockable_nonSystemBlockable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();