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

Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582

Change-Id: I84db13dbe58d05cb8639515e302b927c00342662
This commit is contained in:
TreeHugger Robot
2020-08-25 18:58:11 +00:00
committed by Automerger Merge Worker
parent 887b09614d 794482fb92
commit 98dd4491b7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@ public class BubblePreferenceController extends NotificationPreferenceController
if (isDefaultChannel()) {
return true;
} else {
return mAppRow != null;
return mAppRow != null && mAppRow.bubblePreference != BUBBLE_PREFERENCE_NONE;
}
}
return true;

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

@@ -137,7 +137,7 @@ public class BubblePreferenceControllerTest {
}
@Test
public void isAvailable_channel_yesIfAppOff() {
public void isAvailable_channel_notIfAppOff() {
Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.bubblePreference = BUBBLE_PREFERENCE_NONE;
@@ -145,7 +145,7 @@ public class BubblePreferenceControllerTest {
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null, null, null);
assertTrue(mController.isAvailable());
assertFalse(mController.isAvailable());
}
@Test