Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep bubbles behind a flag

Browse Source 
Alter tests to ignore the flags so they don't fail.

Test: manual - make sure no bubbles show up
      atest BubbleControllerTest
Bug: 111236845
Change-Id: Ieed38165a3699415686ef299cd54da69d7a37cea
This commit is contained in:
Mady Mellor
2019-01-28 11:21:51 -08:00
parent cba2c7c226
commit 9bad224fd0
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
View File

@@ -428,7 +428,7 @@ public class BubbleController {
entry.key).canBubble();
boolean hasOverlayIntent = n.getNotification().getBubbleMetadata() != null
&& n.getNotification().getBubbleMetadata().getIntent() != null;
return hasOverlayIntent && canChannelOverlay && canAppOverlay;
return DEBUG_ENABLE_AUTO_BUBBLE && hasOverlayIntent && canChannelOverlay && canAppOverlay;
}
/**
@@ -438,7 +438,8 @@ public class BubbleController {
* message-like notification.
* </p>
*/
private boolean shouldAutoBubble(Context context, NotificationEntry entry) {
@VisibleForTesting
protected boolean shouldAutoBubble(Context context, NotificationEntry entry) {
if (entry.isBubbleDismissed()) {
return false;
}
@@ -465,9 +466,11 @@ public class BubbleController {
Class<? extends Notification.Style> style = n.getNotification().getNotificationStyle();
boolean isMessageType = Notification.CATEGORY_MESSAGE.equals(n.getNotification().category);
boolean isMessageStyle = Notification.MessagingStyle.class.equals(style);
return (((isMessageType && hasRemoteInput) || isMessageStyle) && autoBubbleMessages)
boolean shouldAutoBubble =
(((isMessageType && hasRemoteInput) || isMessageStyle) && autoBubbleMessages)
|| (isImportantOngoing && autoBubbleOngoing)
|| autoBubbleAll;
return DEBUG_ENABLE_AUTO_BUBBLE && shouldAutoBubble;
}
private static boolean shouldAutoBubbleMessages(Context context) {

6
packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java
View File

@@ -36,6 +36,7 @@ import com.android.systemui.statusbar.NotificationTestHelper;
import com.android.systemui.statusbar.notification.NotificationEntryListener;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.collection.NotificationData;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.phone.DozeParameters;
import com.android.systemui.statusbar.phone.StatusBarWindowController;
@@ -189,5 +190,10 @@ public class BubbleControllerTest extends SysuiTestCase {
StatusBarWindowController statusBarWindowController) {
super(context, statusBarWindowController);
}
@Override
public boolean shouldAutoBubble(Context c, NotificationEntry entry) {
return entry.notification.getNotification().getBubbleMetadata() != null;
}
}
}