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

Merge changes from topic "fix-event-dispatch"

Browse Source 
* changes:
  Invert BubbleController <-> NEM dependency
  Inline a few methods in NotificationEntryManager
  Change onRemoteEntry() to only fire when entries are removed
This commit is contained in:
Ned Burns
2019-01-07 06:29:11 +00:00
committed by Android (Google) Code Review
parent 9d11970303 01e3821aa3
commit 08e5ad89c8
16 changed files with 147 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java
View File

@@ -61,14 +61,9 @@ public class ForegroundServiceNotificationListener {
@Override
public void onEntryRemoved(
NotificationData.Entry entry,
String key,
StatusBarNotification old,
NotificationVisibility visibility,
boolean lifetimeExtended,
boolean removedByUser) {
if (entry != null && !lifetimeExtended) {
removeNotification(entry.notification);
}
removeNotification(entry.notification);
}
});
}

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

@@ -33,8 +33,11 @@ import android.view.WindowManager;
import android.widget.FrameLayout;
import com.android.internal.annotations.VisibleForTesting;
import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.statusbar.notification.NotificationData;
import com.android.systemui.statusbar.notification.NotificationEntryListener;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.phone.StatusBarWindowController;
import java.util.ArrayList;
@@ -57,46 +60,30 @@ public class BubbleController {
private static final String TAG = "BubbleController";
// Enables some subset of notifs to automatically become bubbles
public static final boolean DEBUG_ENABLE_AUTO_BUBBLE = false;
private static final boolean DEBUG_ENABLE_AUTO_BUBBLE = false;
// When a bubble is dismissed, recreate it as a notification
public static final boolean DEBUG_DEMOTE_TO_NOTIF = false;
private static final boolean DEBUG_DEMOTE_TO_NOTIF = false;
// Secure settings
private static final String ENABLE_AUTO_BUBBLE_MESSAGES = "experiment_autobubble_messaging";
private static final String ENABLE_AUTO_BUBBLE_ONGOING = "experiment_autobubble_ongoing";
private static final String ENABLE_AUTO_BUBBLE_ALL = "experiment_autobubble_all";
private Context mContext;
private BubbleDismissListener mDismissListener;
private final Context mContext;
private final NotificationEntryManager mNotificationEntryManager;
private BubbleStateChangeListener mStateChangeListener;
private BubbleExpandListener mExpandListener;
private Map<String, BubbleView> mBubbles = new HashMap<>();
private final Map<String, BubbleView> mBubbles = new HashMap<>();
private BubbleStackView mStackView;
private Point mDisplaySize;
private final Point mDisplaySize;
// Bubbles get added to the status bar view
@VisibleForTesting
protected StatusBarWindowController mStatusBarWindowController;
private final StatusBarWindowController mStatusBarWindowController;
// Used for determining view rect for touch interaction
private Rect mTempRect = new Rect();
/**
* Listener to find out about bubble / bubble stack dismissal events.
*/
public interface BubbleDismissListener {
/**
* Called when the entire stack of bubbles is dismissed by the user.
*/
void onStackDismissed();
/**
* Called when a specific bubble is dismissed by the user.
*/
void onBubbleDismissed(String key);
}
/**
* Listener to be notified when some states of the bubbles change.
*/
@@ -123,17 +110,13 @@ public class BubbleController {
@Inject
public BubbleController(Context context, StatusBarWindowController statusBarWindowController) {
mContext = context;
mNotificationEntryManager = Dependency.get(NotificationEntryManager.class);
WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
mDisplaySize = new Point();
wm.getDefaultDisplay().getSize(mDisplaySize);
mStatusBarWindowController = statusBarWindowController;
}
/**
* Set a listener to be notified of bubble dismissal events.
*/
public void setDismissListener(BubbleDismissListener listener) {
mDismissListener = listener;
mNotificationEntryManager.addNotificationEntryListener(mEntryListener);
}
/**
@@ -180,7 +163,7 @@ public class BubbleController {
/**
* Tell the stack of bubbles to be dismissed, this will remove all of the bubbles in the stack.
*/
public void dismissStack() {
void dismissStack() {
if (mStackView == null) {
return;
}
@@ -190,9 +173,7 @@ public class BubbleController {
for (String key: mBubbles.keySet()) {
removeBubble(key);
}
if (mDismissListener != null) {
mDismissListener.onStackDismissed();
}
mNotificationEntryManager.updateNotifications();
updateBubblesShowing();
}
@@ -238,18 +219,35 @@ public class BubbleController {
/**
* Removes the bubble associated with the {@param uri}.
*/
public void removeBubble(String key) {
void removeBubble(String key) {
BubbleView bv = mBubbles.get(key);
if (mStackView != null && bv != null) {
mStackView.removeBubble(bv);
bv.getEntry().setBubbleDismissed(true);
}
if (mDismissListener != null) {
mDismissListener.onBubbleDismissed(key);
NotificationData.Entry entry = mNotificationEntryManager.getNotificationData().get(key);
if (entry != null) {
entry.setBubbleDismissed(true);
if (!DEBUG_DEMOTE_TO_NOTIF) {
mNotificationEntryManager.performRemoveNotification(entry.notification);
}
}
mNotificationEntryManager.updateNotifications();
updateBubblesShowing();
}
@SuppressWarnings("FieldCanBeLocal")
private final NotificationEntryListener mEntryListener = new NotificationEntryListener() {
@Override
public void onPendingEntryAdded(NotificationData.Entry entry) {
if (shouldAutoBubble(mContext, entry)) {
entry.setIsBubble(true);
}
}
};
private void updateBubblesShowing() {
boolean hasBubblesShowing = false;
for (BubbleView bv : mBubbles.values()) {
@@ -309,7 +307,7 @@ public class BubbleController {
}
@VisibleForTesting
public BubbleStackView getStackView() {
BubbleStackView getStackView() {
return mStackView;
}
@@ -317,7 +315,7 @@ public class BubbleController {
/**
* Gets an appropriate starting point to position the bubble stack.
*/
public static Point getStartPoint(int size, Point displaySize) {
private static Point getStartPoint(int size, Point displaySize) {
final int x = displaySize.x - size + EDGE_OVERLAP;
final int y = displaySize.y / 4;
return new Point(x, y);
@@ -326,7 +324,7 @@ public class BubbleController {
/**
* Gets an appropriate position for the bubble when the stack is expanded.
*/
public static Point getExpandPoint(BubbleStackView view, int size, Point displaySize) {
static Point getExpandPoint(BubbleStackView view, int size, Point displaySize) {
// Same place for now..
return new Point(EDGE_OVERLAP, size);
}
@@ -334,7 +332,7 @@ public class BubbleController {
/**
* Whether the notification should bubble or not.
*/
public static boolean shouldAutoBubble(Context context, NotificationData.Entry entry) {
private static boolean shouldAutoBubble(Context context, NotificationData.Entry entry) {
if (entry.isBubbleDismissed()) {
return false;
}

10
packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
View File

@@ -37,7 +37,6 @@ import android.media.session.PlaybackState;
import android.os.Handler;
import android.os.Trace;
import android.os.UserHandle;
import android.service.notification.StatusBarNotification;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
@@ -157,15 +156,10 @@ public class NotificationMediaManager implements Dumpable {
notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {
@Override
public void onEntryRemoved(
@Nullable Entry entry,
String key,
StatusBarNotification old,
Entry entry,
NotificationVisibility visibility,
boolean lifetimeExtended,
boolean removedByUser) {
if (!lifetimeExtended) {
onNotificationRemoved(key);
}
onNotificationRemoved(entry.key);
}
});
}

5
packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
View File

@@ -254,13 +254,10 @@ public class NotificationRemoteInputManager implements Dumpable {
@Override
public void onEntryRemoved(
@Nullable NotificationData.Entry entry,
String key,
StatusBarNotification old,
NotificationVisibility visibility,
boolean lifetimeExtended,
boolean removedByUser) {
if (removedByUser && entry != null) {
onPerformRemoveNotification(entry, key);
onPerformRemoveNotification(entry, entry.key);
}
}
});

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationAlertingManager.java
View File

@@ -20,7 +20,6 @@ import static com.android.systemui.statusbar.NotificationRemoteInputManager.FORC
import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT;
import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_HEADS_UP;
import android.annotation.Nullable;
import android.app.Notification;
import android.service.notification.StatusBarNotification;
import android.util.Log;
@@ -83,13 +82,10 @@ public class NotificationAlertingManager {
@Override
public void onEntryRemoved(
@Nullable NotificationData.Entry entry,
String key,
StatusBarNotification old,
NotificationData.Entry entry,
NotificationVisibility visibility,
boolean lifetimeExtended,
boolean removedByUser) {
stopAlerting(key);
stopAlerting(entry.key);
}
});
}

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java
View File

@@ -71,20 +71,14 @@ public interface NotificationEntryListener {
* because the developer retracted it).
* @param entry notification data entry that was removed. Null if no entry existed for the
* removed key at the time of removal.
* @param key key of notification that was removed
* @param old StatusBarNotification of the notification before it was removed
* @param visibility logging data related to the visibility of the notification at the time of
* removal, if it was removed by a user action. Null if it was not removed by
* a user action.
* @param lifetimeExtended true if something is artificially extending how long the notification
* @param removedByUser true if the notification was removed by a user action
*/
default void onEntryRemoved(
@Nullable NotificationData.Entry entry,
String key,
StatusBarNotification old,
NotificationData.Entry entry,
@Nullable NotificationVisibility visibility,
boolean lifetimeExtended,
boolean removedByUser) {
}
}

107
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java
View File

@@ -15,8 +15,6 @@
*/
package com.android.systemui.statusbar.notification;
import static com.android.systemui.bubbles.BubbleController.DEBUG_DEMOTE_TO_NOTIF;
import android.annotation.Nullable;
import android.app.Notification;
import android.content.Context;
@@ -33,7 +31,6 @@ import com.android.internal.statusbar.NotificationVisibility;
import com.android.systemui.Dependency;
import com.android.systemui.Dumpable;
import com.android.systemui.ForegroundServiceController;
import com.android.systemui.bubbles.BubbleController;
import com.android.systemui.statusbar.NotificationLifetimeExtender;
import com.android.systemui.statusbar.NotificationPresenter;
import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -64,8 +61,7 @@ public class NotificationEntryManager implements
Dumpable,
NotificationInflater.InflationCallback,
NotificationUpdateHandler,
VisualStabilityManager.Callback,
BubbleController.BubbleDismissListener {
VisualStabilityManager.Callback {
private static final String TAG = "NotificationEntryMgr";
protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -80,7 +76,6 @@ public class NotificationEntryManager implements
Dependency.get(DeviceProvisionedController.class);
private final ForegroundServiceController mForegroundServiceController =
Dependency.get(ForegroundServiceController.class);
private final BubbleController mBubbleController = Dependency.get(BubbleController.class);
// Lazily retrieved dependencies
private NotificationRemoteInputManager mRemoteInputManager;
@@ -126,7 +121,6 @@ public class NotificationEntryManager implements
public NotificationEntryManager(Context context) {
mContext = context;
mBubbleController.setDismissListener(this /* bubbleEventListener */);
mNotificationData = new NotificationData();
mDeferredNotificationViewUpdateHandler = new Handler();
}
@@ -153,6 +147,12 @@ public class NotificationEntryManager implements
return mNotificationRowBinder;
}
// TODO: Remove this once we can always use a mocked row binder in our tests
@VisibleForTesting
void setRowBinder(NotificationRowBinder notificationRowBinder) {
mNotificationRowBinder = notificationRowBinder;
}
public void setUpWithPresenter(NotificationPresenter presenter,
NotificationListContainer listContainer,
HeadsUpManager headsUpManager) {
@@ -203,23 +203,6 @@ public class NotificationEntryManager implements
n.getKey(), null, nv, false /* forceRemove */, true /* removedByUser */);
}
@Override
public void onStackDismissed() {
updateNotifications();
}
@Override
public void onBubbleDismissed(String key) {
NotificationData.Entry entry = mNotificationData.get(key);
if (entry != null) {
entry.setBubbleDismissed(true);
if (!DEBUG_DEMOTE_TO_NOTIF) {
performRemoveNotification(entry.notification);
}
}
updateNotifications();
}
private void abortExistingInflation(String key) {
if (mPendingNotifications.containsKey(key)) {
NotificationData.Entry entry = mPendingNotifications.get(key);
@@ -247,21 +230,6 @@ public class NotificationEntryManager implements
}
}
private void addEntry(NotificationData.Entry shadeEntry) {
if (shadeEntry == null) {
return;
}
// Add the expanded view and icon.
mNotificationData.add(shadeEntry);
tagForeground(shadeEntry.notification);
updateNotifications();
for (NotificationEntryListener listener : mNotificationEntryListeners) {
listener.onNotificationAdded(shadeEntry);
}
maybeScheduleUpdateNotificationViews(shadeEntry);
}
private void maybeScheduleUpdateNotificationViews(NotificationData.Entry entry) {
long audibleAlertTimeout = RECENTLY_ALERTED_THRESHOLD_MS
- (System.currentTimeMillis() - entry.lastAudiblyAlertedMs);
@@ -283,7 +251,13 @@ public class NotificationEntryManager implements
for (NotificationEntryListener listener : mNotificationEntryListeners) {
listener.onEntryInflated(entry, inflatedFlags);
}
addEntry(entry);
mNotificationData.add(entry);
tagForeground(entry.notification);
updateNotifications();
for (NotificationEntryListener listener : mNotificationEntryListeners) {
listener.onNotificationAdded(entry);
}
maybeScheduleUpdateNotificationViews(entry);
} else {
for (NotificationEntryListener listener : mNotificationEntryListeners) {
listener.onEntryReinflated(entry);
@@ -309,7 +283,6 @@ public class NotificationEntryManager implements
abortExistingInflation(key);
StatusBarNotification old = null;
boolean lifetimeExtended = false;
if (entry != null) {
@@ -342,25 +315,15 @@ public class NotificationEntryManager implements
// Let's remove the children if this was a summary
handleGroupSummaryRemoved(key);
old = removeNotificationViews(key, ranking);
mNotificationData.remove(key, ranking);
updateNotifications();
Dependency.get(LeakDetector.class).trackGarbage(entry);
for (NotificationEntryListener listener : mNotificationEntryListeners) {
listener.onEntryRemoved(entry, visibility, removedByUser);
}
}
}
for (NotificationEntryListener listener : mNotificationEntryListeners) {
listener.onEntryRemoved(entry, key, old, visibility, lifetimeExtended, removedByUser);
}
}
private StatusBarNotification removeNotificationViews(String key,
NotificationListenerService.RankingMap ranking) {
NotificationData.Entry entry = mNotificationData.remove(key, ranking);
if (entry == null) {
Log.w(TAG, "removeNotification for unknown key: " + key);
return null;
}
updateNotifications();
Dependency.get(LeakDetector.class).trackGarbage(entry);
return entry.notification;
}
/**
@@ -418,25 +381,6 @@ public class NotificationEntryManager implements
}
}
private NotificationData.Entry createNotificationEntry(
StatusBarNotification sbn, NotificationListenerService.Ranking ranking)
throws InflationException {
if (DEBUG) {
Log.d(TAG, "createNotificationEntry(notification=" + sbn + " " + ranking);
}
NotificationData.Entry entry = new NotificationData.Entry(sbn, ranking);
if (BubbleController.shouldAutoBubble(getContext(), entry)) {
entry.setIsBubble(true);
}
Dependency.get(LeakDetector.class).trackInstance(entry);
// Construct the expanded view.
getRowBinder().inflateViews(entry, () -> performRemoveNotification(sbn),
mNotificationData.get(entry.key) != null);
return entry;
}
private void addNotificationInternal(StatusBarNotification notification,
NotificationListenerService.RankingMap rankingMap) throws InflationException {
String key = notification.getKey();
@@ -447,7 +391,14 @@ public class NotificationEntryManager implements
mNotificationData.updateRanking(rankingMap);
NotificationListenerService.Ranking ranking = new NotificationListenerService.Ranking();
rankingMap.getRanking(key, ranking);
NotificationData.Entry entry = createNotificationEntry(notification, ranking);
NotificationData.Entry entry = new NotificationData.Entry(notification, ranking);
Dependency.get(LeakDetector.class).trackInstance(entry);
// Construct the expanded view.
getRowBinder().inflateViews(entry, () -> performRemoveNotification(notification),
mNotificationData.get(entry.key) != null);
abortExistingInflation(key);
mPendingNotifications.put(key, entry);

10
packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java
View File

@@ -15,7 +15,6 @@
*/
package com.android.systemui.statusbar.notification.logging;
import android.annotation.Nullable;
import android.content.Context;
import android.os.Handler;
import android.os.RemoteException;
@@ -168,14 +167,11 @@ public class NotificationLogger implements StateListener {
entryManager.addNotificationEntryListener(new NotificationEntryListener() {
@Override
public void onEntryRemoved(
@Nullable NotificationData.Entry entry,
String key,
StatusBarNotification old,
NotificationData.Entry entry,
NotificationVisibility visibility,
boolean lifetimeExtended,
boolean removedByUser) {
if (removedByUser && visibility != null && entry != null) {
logNotificationClear(key, entry.notification, visibility);
if (removedByUser && visibility != null) {
logNotificationClear(entry.key, entry.notification, visibility);
}
}

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelper.java
View File

@@ -220,15 +220,12 @@ public class NotificationGroupAlertTransferHelper implements OnHeadsUpChangedLis
@Override
public void onEntryRemoved(
@Nullable Entry entry,
String key,
StatusBarNotification old,
NotificationVisibility visibility,
boolean lifetimeExtended,
boolean removedByUser) {
// Removes any alerts pending on this entry. Note that this will not stop any inflation
// tasks started by a transfer, so this should only be used as clean-up for when
// inflation is stopped and the pending alert no longer needs to happen.
mPendingAlerts.remove(key);
mPendingAlerts.remove(entry.key);
}
};

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java
View File

@@ -196,14 +196,10 @@ public class StatusBarNotificationPresenter implements NotificationPresenter,
@Override
public void onEntryRemoved(
@Nullable Entry entry,
String key,
StatusBarNotification old,
NotificationVisibility visibility,
boolean lifetimeExtended,
boolean removedByUser) {
if (!lifetimeExtended) {
StatusBarNotificationPresenter.this.onNotificationRemoved(key, old);
}
StatusBarNotificationPresenter.this.onNotificationRemoved(
entry.key, entry.notification);
if (removedByUser) {
maybeEndAmbientPulse();
}

2
packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
View File

@@ -392,7 +392,7 @@ public class ForegroundServiceControllerTest extends SysuiTestCase {
private void entryRemoved(StatusBarNotification notification) {
mEntryListener.onEntryRemoved(new NotificationData.Entry(notification),
null, null, null, false, false);
null, false);
}
private void entryAdded(StatusBarNotification notification, int importance) {

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

@@ -18,6 +18,10 @@ package com.android.systemui.bubbles;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.IActivityManager;
import android.content.Context;
@@ -29,6 +33,9 @@ import android.widget.FrameLayout;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.statusbar.NotificationTestHelper;
import com.android.systemui.statusbar.notification.NotificationData;
import com.android.systemui.statusbar.notification.NotificationEntryListener;
import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.phone.DozeParameters;
import com.android.systemui.statusbar.phone.StatusBarWindowController;
@@ -36,6 +43,8 @@ import com.android.systemui.statusbar.phone.StatusBarWindowController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -44,6 +53,8 @@ import org.mockito.MockitoAnnotations;
@TestableLooper.RunWithLooper(setAsMainLooper = true)
public class BubbleControllerTest extends SysuiTestCase {
@Mock
private NotificationEntryManager mNotificationEntryManager;
@Mock
private WindowManager mWindowManager;
@Mock
@@ -52,17 +63,23 @@ public class BubbleControllerTest extends SysuiTestCase {
private DozeParameters mDozeParameters;
@Mock
private FrameLayout mStatusBarView;
@Captor
private ArgumentCaptor<NotificationEntryListener> mEntryListenerCaptor;
private TestableBubbleController mBubbleController;
private StatusBarWindowController mStatusBarWindowController;
private NotificationEntryListener mEntryListener;
private NotificationTestHelper mNotificationTestHelper;
private ExpandableNotificationRow mRow;
private ExpandableNotificationRow mRow2;
private final NotificationData mNotificationData = new NotificationData();
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mDependency.injectTestDependency(NotificationEntryManager.class, mNotificationEntryManager);
// Bubbles get added to status bar window view
mStatusBarWindowController = new StatusBarWindowController(mContext, mWindowManager,
@@ -74,7 +91,15 @@ public class BubbleControllerTest extends SysuiTestCase {
mRow = mNotificationTestHelper.createBubble();
mRow2 = mNotificationTestHelper.createBubble();
// Return non-null notification data from the NEM
when(mNotificationEntryManager.getNotificationData()).thenReturn(mNotificationData);
mBubbleController = new TestableBubbleController(mContext, mStatusBarWindowController);
// Get a reference to the BubbleController's entry listener
verify(mNotificationEntryManager, atLeastOnce())
.addNotificationEntryListener(mEntryListenerCaptor.capture());
mEntryListener = mEntryListenerCaptor.getValue();
}
@Test
@@ -102,6 +127,8 @@ public class BubbleControllerTest extends SysuiTestCase {
mBubbleController.removeBubble(mRow.getEntry().key);
assertFalse(mStatusBarWindowController.getBubblesShowing());
assertTrue(mRow.getEntry().isBubbleDismissed());
verify(mNotificationEntryManager).updateNotifications();
}
@Test
@@ -112,6 +139,7 @@ public class BubbleControllerTest extends SysuiTestCase {
mBubbleController.dismissStack();
assertFalse(mStatusBarWindowController.getBubblesShowing());
verify(mNotificationEntryManager, times(3)).updateNotifications();
}
@Test
@@ -140,6 +168,12 @@ public class BubbleControllerTest extends SysuiTestCase {
assertFalse(mBubbleController.isStackExpanded());
}
@Test
public void testMarkNewNotificationAsBubble() {
mEntryListener.onPendingEntryAdded(mRow.getEntry());
assertTrue(mRow.getEntry().isBubble());
}
static class TestableBubbleController extends BubbleController {
TestableBubbleController(Context context,

4
packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java
View File

@@ -77,7 +77,7 @@ public class NotificationViewHierarchyManagerTest extends SysuiTestCase {
@Mock private ShadeController mShadeController;
private NotificationViewHierarchyManager mViewHierarchyManager;
private NotificationTestHelper mHelper = new NotificationTestHelper(mContext);
private NotificationTestHelper mHelper;
@Before
public void setUp() {
@@ -90,6 +90,8 @@ public class NotificationViewHierarchyManagerTest extends SysuiTestCase {
mDependency.injectTestDependency(VisualStabilityManager.class, mVisualStabilityManager);
mDependency.injectTestDependency(ShadeController.class, mShadeController);
mHelper = new NotificationTestHelper(mContext);
when(mEntryManager.getNotificationData()).thenReturn(mNotificationData);
mViewHierarchyManager = new NotificationViewHierarchyManager(mContext,

32
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java
View File

@@ -121,6 +121,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
@Mock private MetricsLogger mMetricsLogger;
@Mock private SmartReplyController mSmartReplyController;
@Mock private RowInflaterTask mAsyncInflationTask;
@Mock private NotificationRowBinder mMockedRowBinder;
private NotificationData.Entry mEntry;
private StatusBarNotification mSbn;
@@ -310,8 +311,8 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
verify(mListContainer).cleanUpViewStateForEntry(mEntry);
verify(mPresenter).updateNotificationViews();
verify(mEntryListener).onEntryRemoved(mEntry, mSbn.getKey(), mSbn,
null, false /* lifetimeExtended */, false /* removedByUser */);
verify(mEntryListener).onEntryRemoved(
mEntry, null, false /* removedByUser */);
verify(mRow).setRemoved();
assertNull(mEntryManager.getNotificationData().get(mSbn.getKey()));
@@ -335,8 +336,31 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
assertNotNull(mEntryManager.getNotificationData().get(mSbn.getKey()));
verify(extender).setShouldManageLifetime(mEntry, true /* shouldManage */);
verify(mEntryListener).onEntryRemoved(mEntry, mSbn.getKey(), null,
null, true /* lifetimeExtended */, false /* removedByUser */);
verify(mEntryListener, never()).onEntryRemoved(
mEntry, null, false /* removedByUser */);
}
@Test
public void testRemoveNotification_onEntryRemoveNotFiredIfEntryDoesntExist() {
com.android.systemui.util.Assert.isNotMainThread();
mEntryManager.removeNotification("not_a_real_key", mRankingMap);
verify(mEntryListener, never()).onEntryRemoved(
mEntry, null, false /* removedByUser */);
}
@Test
public void testRemoveNotification_whilePending() throws InterruptedException {
com.android.systemui.util.Assert.isNotMainThread();
mEntryManager.setRowBinder(mMockedRowBinder);
mEntryManager.addNotification(mSbn, mRankingMap);
mEntryManager.removeNotification(mSbn.getKey(), mRankingMap);
verify(mEntryListener, never()).onEntryRemoved(
mEntry, null, false /* removedByUser */);
}
@Test

5
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java
View File

@@ -159,11 +159,6 @@ public class NotificationLoggerTest extends SysuiTestCase {
verify(mBarService, times(1)).onNotificationVisibilityChanged(any(), any());
}
@Test
public void testHandleNullEntryOnEntryRemoved() {
mNotificationEntryListener.onEntryRemoved(null, "foobar", null, null, false, false);
}
private class TestableNotificationLogger extends NotificationLogger {
TestableNotificationLogger(NotificationListener notificationListener,

3
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupAlertTransferHelperTest.java
View File

@@ -237,8 +237,7 @@ public class NotificationGroupAlertTransferHelperTest extends SysuiTestCase {
mGroupManager.onEntryAdded(summaryEntry);
mGroupManager.onEntryAdded(childEntry);
mNotificationEntryListener.onEntryRemoved(childEntry, childEntry.key, null, null,
false, false);
mNotificationEntryListener.onEntryRemoved(childEntry, null, false);
assertFalse(mGroupAlertTransferHelper.isAlertTransferPending(childEntry));
}