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

Merge "Fix 'show badge' for pre O apps" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-29 23:06:26 +00:00
committed by Android (Google) Code Review
parent ee283563c8 6f2450636a
commit d31c655a12
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/BadgePreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.notification;
import static android.provider.Settings.Secure.NOTIFICATION_BADGING; import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
import android.app.NotificationChannel;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
@@ -55,8 +56,12 @@ public class BadgePreferenceController extends NotificationPreferenceController
NOTIFICATION_BADGING, SYSTEM_WIDE_ON) == SYSTEM_WIDE_OFF) { NOTIFICATION_BADGING, SYSTEM_WIDE_ON) == SYSTEM_WIDE_OFF) {
return false; return false;
} }
if (mChannel != null && !mAppRow.showBadge) { if (mChannel != null) {
return false; if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())) {
return true;
} else {
return mAppRow.showBadge;
}
} }
return true; return true;
} }

29
tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
View File

@@ -133,6 +133,19 @@ public class BadgePreferenceControllerTest {
assertTrue(mController.isAvailable()); assertTrue(mController.isAvailable());
} }
@Test
public void testIsAvailable_defaultChannel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.showBadge = true;
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
mController.onResume(appRow, channel, null, null);
Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BADGING, 1);
assertTrue(mController.isAvailable());
}
@Test @Test
public void testIsAvailable_channel() { public void testIsAvailable_channel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -145,12 +158,24 @@ public class BadgePreferenceControllerTest {
assertTrue(mController.isAvailable()); assertTrue(mController.isAvailable());
} }
@Test
public void testIsAvailable_channelAppOff() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.showBadge = false;
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BADGING, 1);
assertFalse(mController.isAvailable());
}
@Test @Test
public void testUpdateState_disabledByAdmin() { public void testUpdateState_disabledByAdmin() {
NotificationChannel channel = mock(NotificationChannel.class); NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn("something"); when(channel.getId()).thenReturn("something");
mController.onResume( mController.onResume(new NotificationBackend.AppRow(), channel, null,
new NotificationBackend.AppRow(), channel, null, mock(RestrictedLockUtils.EnforcedAdmin.class)); mock(RestrictedLockUtils.EnforcedAdmin.class));
Preference pref = new RestrictedSwitchPreference(mContext); Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref); mController.updateState(pref);