Re-format files
Run ktfmt to reformat the files touched by adding logs to track the
reasons for calling HeadsUpManager#removeNotification.
Bug: 357316448
Test: atest SystemUITests
Flag: EXEMPT refactor
Change-Id: I95fd75acfade2ef9d77d32d342b4d29725324c40
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/HeadsUpManagerPhoneTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/HeadsUpManagerPhoneTest.kt
index 614cc6d..ca106fa 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/HeadsUpManagerPhoneTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/HeadsUpManagerPhoneTest.kt
@@ -179,8 +179,8 @@
mContext
.getOrCreateTestableResources()
.addOverride(R.integer.ambient_notification_extension_time, 500)
- mAvalancheController = AvalancheController(dumpManager, mUiEventLogger,
- mHeadsUpManagerLogger, mBgHandler)
+ mAvalancheController =
+ AvalancheController(dumpManager, mUiEventLogger, mHeadsUpManagerLogger, mBgHandler)
}
@Test
@@ -200,11 +200,12 @@
hmp.addSwipedOutNotification(entry.key)
// Remove should succeed because the notification is swiped out
- val removedImmediately = hmp.removeNotification(
+ val removedImmediately =
+ hmp.removeNotification(
entry.key,
/* releaseImmediately= */ false,
- /* reason= */"swipe out"
- )
+ /* reason= */ "swipe out"
+ )
Assert.assertTrue(removedImmediately)
Assert.assertFalse(hmp.isHeadsUpEntry(entry.key))
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTransitionAnimatorController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTransitionAnimatorController.kt
index 44568ac..67c53d46 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTransitionAnimatorController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTransitionAnimatorController.kt
@@ -173,7 +173,12 @@
// TODO: b/297247841 - Call on the row we're removing, which may differ from notification.
HeadsUpUtil.setNeedsHeadsUpDisappearAnimationAfterClick(notification, animate)
- headsUpManager.removeNotification(row.entry.key, true /* releaseImmediately */, animate, reason)
+ headsUpManager.removeNotification(
+ row.entry.key,
+ true /* releaseImmediately */,
+ animate,
+ reason
+ )
}
override fun onTransitionAnimationCancelled(newKeyguardOccludedState: Boolean?) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt
index 512845e..ec8566b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt
@@ -497,9 +497,9 @@
if (posted.isHeadsUpEntry) {
// We don't want this to be interrupting anymore, let's remove it
mHeadsUpManager.removeNotification(
- posted.key,
- /* removeImmediately= */ false,
- "onEntryUpdated"
+ posted.key,
+ /* removeImmediately= */ false,
+ "onEntryUpdated"
)
} else if (posted.isBinding) {
// Don't let the bind finish
@@ -524,7 +524,11 @@
val removeImmediatelyForRemoteInput =
(mRemoteInputManager.isSpinning(entryKey) &&
!NotificationRemoteInputManager.FORCE_REMOTE_INPUT_HISTORY)
- mHeadsUpManager.removeNotification(entry.key, removeImmediatelyForRemoteInput, "onEntryRemoved, reason: $reason")
+ mHeadsUpManager.removeNotification(
+ entry.key,
+ removeImmediatelyForRemoteInput,
+ "onEntryRemoved, reason: $reason"
+ )
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
index 35fdacc..0a6e7f5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
@@ -231,7 +231,7 @@
mBubblesManagerOptional.ifPresent(bubblesManager ->
bubblesManager.onUserChangedBubble(entry, !entry.isBubble()));
mHeadsUpManager.removeNotification(entry.getKey(), /* releaseImmediately= */ true,
- "onNotificationBubbleIconClicked");
+ /* reason= */ "onNotificationBubbleIconClicked");
};
if (entry.isBubble()) {
// entry is being un-bubbled, no need to unlock
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.kt
index 6b83fc1..04fe6b3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.kt
@@ -112,10 +112,11 @@
* @return true if notification is removed, false otherwise
*/
fun removeNotification(
- key: String,
- releaseImmediately: Boolean,
- animate: Boolean,
- reason: String): Boolean
+ key: String,
+ releaseImmediately: Boolean,
+ animate: Boolean,
+ reason: String
+ ): Boolean
/** Clears all managed notifications. */
fun releaseAllImmediately()
@@ -253,13 +254,13 @@
override fun removeListener(listener: OnHeadsUpChangedListener) {}
override fun removeNotification(key: String, releaseImmediately: Boolean, reason: String) =
- false
+ false
override fun removeNotification(
- key: String,
- releaseImmediately: Boolean,
- animate: Boolean,
- reason: String
+ key: String,
+ releaseImmediately: Boolean,
+ animate: Boolean,
+ reason: String
) = false
override fun setAnimationStateHandler(handler: AnimationStateHandler) {}
@@ -293,7 +294,5 @@
@Module
interface HeadsUpEmptyImplModule {
- @Binds
- @SysUISingleton
- fun bindsHeadsUpManager(noOpHum: HeadsUpManagerEmptyImpl): HeadsUpManager
+ @Binds @SysUISingleton fun bindsHeadsUpManager(noOpHum: HeadsUpManagerEmptyImpl): HeadsUpManager
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManagerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManagerLogger.kt
index 7dd4ef6..c6fc547 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManagerLogger.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManagerLogger.kt
@@ -16,181 +16,196 @@
package com.android.systemui.statusbar.policy
-import com.android.systemui.log.dagger.NotificationHeadsUpLog
import com.android.systemui.log.LogBuffer
import com.android.systemui.log.core.LogLevel.INFO
import com.android.systemui.log.core.LogLevel.VERBOSE
+import com.android.systemui.log.dagger.NotificationHeadsUpLog
import com.android.systemui.statusbar.notification.collection.NotificationEntry
import com.android.systemui.statusbar.notification.logKey
import javax.inject.Inject
/** Logger for [HeadsUpManager]. */
-class HeadsUpManagerLogger @Inject constructor(
- @NotificationHeadsUpLog private val buffer: LogBuffer
-) {
+class HeadsUpManagerLogger
+@Inject
+constructor(@NotificationHeadsUpLog private val buffer: LogBuffer) {
fun logPackageSnoozed(snoozeKey: String) {
- buffer.log(TAG, INFO, {
- str1 = snoozeKey
- }, {
- "package snoozed $str1"
- })
+ buffer.log(TAG, INFO, { str1 = snoozeKey }, { "package snoozed $str1" })
}
fun logPackageUnsnoozed(snoozeKey: String) {
- buffer.log(TAG, INFO, {
- str1 = snoozeKey
- }, {
- "package unsnoozed $str1"
- })
+ buffer.log(TAG, INFO, { str1 = snoozeKey }, { "package unsnoozed $str1" })
}
fun logIsSnoozedReturned(snoozeKey: String) {
- buffer.log(TAG, INFO, {
- str1 = snoozeKey
- }, {
- "package snoozed when queried $str1"
- })
+ buffer.log(TAG, INFO, { str1 = snoozeKey }, { "package snoozed when queried $str1" })
}
fun logReleaseAllImmediately() {
- buffer.log(TAG, INFO, { }, {
- "release all immediately"
- })
+ buffer.log(TAG, INFO, {}, { "release all immediately" })
}
fun logShowNotificationRequest(entry: NotificationEntry) {
- buffer.log(TAG, INFO, {
- str1 = entry.logKey
- }, {
- "request: show notification $str1"
- })
+ buffer.log(TAG, INFO, { str1 = entry.logKey }, { "request: show notification $str1" })
}
- fun logAvalancheUpdate(caller: String, isEnabled: Boolean, notifEntryKey: String,
- outcome: String) {
- buffer.log(TAG, INFO, {
- str1 = caller
- str2 = notifEntryKey
- str3 = outcome
- bool1 = isEnabled
- }, {
- "$str1\n\t=> AC[isEnabled:$bool1] update: $str2\n\t=> $str3"
- })
+ fun logAvalancheUpdate(
+ caller: String,
+ isEnabled: Boolean,
+ notifEntryKey: String,
+ outcome: String
+ ) {
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = caller
+ str2 = notifEntryKey
+ str3 = outcome
+ bool1 = isEnabled
+ },
+ { "$str1\n\t=> AC[isEnabled:$bool1] update: $str2\n\t=> $str3" }
+ )
}
- fun logAvalancheDelete(caller: String, isEnabled: Boolean, notifEntryKey: String,
- outcome: String) {
- buffer.log(TAG, INFO, {
- str1 = caller
- str2 = notifEntryKey
- str3 = outcome
- bool1 = isEnabled
- }, {
- "$str1\n\t=> AC[isEnabled:$bool1] delete: $str2\n\t=> $str3"
- })
+ fun logAvalancheDelete(
+ caller: String,
+ isEnabled: Boolean,
+ notifEntryKey: String,
+ outcome: String
+ ) {
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = caller
+ str2 = notifEntryKey
+ str3 = outcome
+ bool1 = isEnabled
+ },
+ { "$str1\n\t=> AC[isEnabled:$bool1] delete: $str2\n\t=> $str3" }
+ )
}
fun logShowNotification(entry: NotificationEntry) {
- buffer.log(TAG, INFO, {
- str1 = entry.logKey
- }, {
- "show notification $str1"
- })
+ buffer.log(TAG, INFO, { str1 = entry.logKey }, { "show notification $str1" })
}
fun logAutoRemoveScheduled(entry: NotificationEntry, delayMillis: Long, reason: String) {
- buffer.log(TAG, INFO, {
- str1 = entry.logKey
- long1 = delayMillis
- str2 = reason
- }, {
- "schedule auto remove of $str1 in $long1 ms reason: $str2"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = entry.logKey
+ long1 = delayMillis
+ str2 = reason
+ },
+ { "schedule auto remove of $str1 in $long1 ms reason: $str2" }
+ )
}
fun logAutoRemoveRequest(entry: NotificationEntry, reason: String) {
- buffer.log(TAG, INFO, {
- str1 = entry.logKey
- str2 = reason
- }, {
- "request: reschedule auto remove of $str1 reason: $str2"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = entry.logKey
+ str2 = reason
+ },
+ { "request: reschedule auto remove of $str1 reason: $str2" }
+ )
}
fun logAutoRemoveRescheduled(entry: NotificationEntry, delayMillis: Long, reason: String) {
- buffer.log(TAG, INFO, {
- str1 = entry.logKey
- long1 = delayMillis
- str2 = reason
- }, {
- "reschedule auto remove of $str1 in $long1 ms reason: $str2"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = entry.logKey
+ long1 = delayMillis
+ str2 = reason
+ },
+ { "reschedule auto remove of $str1 in $long1 ms reason: $str2" }
+ )
}
fun logAutoRemoveCancelRequest(entry: NotificationEntry, reason: String?) {
- buffer.log(TAG, INFO, {
- str1 = entry.logKey
- str2 = reason ?: "unknown"
- }, {
- "request: cancel auto remove of $str1 reason: $str2"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = entry.logKey
+ str2 = reason ?: "unknown"
+ },
+ { "request: cancel auto remove of $str1 reason: $str2" }
+ )
}
fun logAutoRemoveCanceled(entry: NotificationEntry, reason: String?) {
- buffer.log(TAG, INFO, {
- str1 = entry.logKey
- str2 = reason ?: "unknown"
- }, {
- "cancel auto remove of $str1 reason: $str2"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = entry.logKey
+ str2 = reason ?: "unknown"
+ },
+ { "cancel auto remove of $str1 reason: $str2" }
+ )
}
fun logRemoveEntryRequest(key: String, reason: String, isWaiting: Boolean) {
- buffer.log(TAG, INFO, {
- str1 = logKey(key)
- str2 = reason
- bool1 = isWaiting
- }, {
- "request: $str2 => remove entry $str1 isWaiting: $isWaiting"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = logKey(key)
+ str2 = reason
+ bool1 = isWaiting
+ },
+ { "request: $str2 => remove entry $str1 isWaiting: $isWaiting" }
+ )
}
fun logRemoveEntry(key: String, reason: String, isWaiting: Boolean) {
- buffer.log(TAG, INFO, {
- str1 = logKey(key)
- str2 = reason
- bool1 = isWaiting
- }, {
- "$str2 => remove entry $str1 isWaiting: $isWaiting"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = logKey(key)
+ str2 = reason
+ bool1 = isWaiting
+ },
+ { "$str2 => remove entry $str1 isWaiting: $isWaiting" }
+ )
}
fun logUnpinEntryRequest(key: String) {
- buffer.log(TAG, INFO, {
- str1 = logKey(key)
- }, {
- "request: unpin entry $str1"
- })
+ buffer.log(TAG, INFO, { str1 = logKey(key) }, { "request: unpin entry $str1" })
}
fun logUnpinEntry(key: String) {
- buffer.log(TAG, INFO, {
- str1 = logKey(key)
- }, {
- "unpin entry $str1"
- })
+ buffer.log(TAG, INFO, { str1 = logKey(key) }, { "unpin entry $str1" })
}
- fun logRemoveNotification(key: String, releaseImmediately: Boolean, isWaiting: Boolean,
- reason: String) {
- buffer.log(TAG, INFO, {
- str1 = logKey(key)
- bool1 = releaseImmediately
- bool2 = isWaiting
- str2 = reason
- }, {
- "remove notification $str1 releaseImmediately: $bool1 isWaiting: $bool2 reason: $str2"
- })
+ fun logRemoveNotification(
+ key: String,
+ releaseImmediately: Boolean,
+ isWaiting: Boolean,
+ reason: String
+ ) {
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = logKey(key)
+ bool1 = releaseImmediately
+ bool2 = isWaiting
+ str2 = reason
+ },
+ {
+ "remove notification $str1 releaseImmediately: $bool1 isWaiting: $bool2 " +
+ "reason: $str2"
+ }
+ )
}
fun logNullEntry(key: String, reason: String) {
@@ -206,68 +221,78 @@
}
fun logNotificationActuallyRemoved(entry: NotificationEntry) {
- buffer.log(TAG, INFO, {
- str1 = entry.logKey
- }, {
- "notification removed $str1 "
- })
+ buffer.log(TAG, INFO, { str1 = entry.logKey }, { "notification removed $str1 " })
}
fun logUpdateNotificationRequest(key: String, alert: Boolean, hasEntry: Boolean) {
- buffer.log(TAG, INFO, {
- str1 = logKey(key)
- bool1 = alert
- bool2 = hasEntry
- }, {
- "request: update notification $str1 alert: $bool1 hasEntry: $bool2"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = logKey(key)
+ bool1 = alert
+ bool2 = hasEntry
+ },
+ { "request: update notification $str1 alert: $bool1 hasEntry: $bool2" }
+ )
}
fun logUpdateNotification(key: String, alert: Boolean, hasEntry: Boolean) {
- buffer.log(TAG, INFO, {
- str1 = logKey(key)
- bool1 = alert
- bool2 = hasEntry
- }, {
- "update notification $str1 alert: $bool1 hasEntry: $bool2"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = logKey(key)
+ bool1 = alert
+ bool2 = hasEntry
+ },
+ { "update notification $str1 alert: $bool1 hasEntry: $bool2" }
+ )
}
fun logUpdateEntry(entry: NotificationEntry, updatePostTime: Boolean, reason: String?) {
- buffer.log(TAG, INFO, {
- str1 = entry.logKey
- bool1 = updatePostTime
- str2 = reason ?: "unknown"
- }, {
- "update entry $str1 updatePostTime: $bool1 reason: $str2"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ {
+ str1 = entry.logKey
+ bool1 = updatePostTime
+ str2 = reason ?: "unknown"
+ },
+ { "update entry $str1 updatePostTime: $bool1 reason: $str2" }
+ )
}
fun logSnoozeLengthChange(packageSnoozeLengthMs: Int) {
- buffer.log(TAG, INFO, {
- int1 = packageSnoozeLengthMs
- }, {
- "snooze length changed: ${int1}ms"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ { int1 = packageSnoozeLengthMs },
+ { "snooze length changed: ${int1}ms" }
+ )
}
fun logSetEntryPinned(entry: NotificationEntry, isPinned: Boolean, reason: String) {
- buffer.log(TAG, VERBOSE, {
- str1 = entry.logKey
- bool1 = isPinned
- str2 = reason
- }, {
- "$str2 => set entry pinned $str1 pinned: $bool1"
- })
+ buffer.log(
+ TAG,
+ VERBOSE,
+ {
+ str1 = entry.logKey
+ bool1 = isPinned
+ str2 = reason
+ },
+ { "$str2 => set entry pinned $str1 pinned: $bool1" }
+ )
}
fun logUpdatePinnedMode(hasPinnedNotification: Boolean) {
- buffer.log(TAG, INFO, {
- bool1 = hasPinnedNotification
- }, {
- "has pinned notification changed to $bool1"
- })
+ buffer.log(
+ TAG,
+ INFO,
+ { bool1 = hasPinnedNotification },
+ { "has pinned notification changed to $bool1" }
+ )
}
}
-private const val TAG = "HeadsUpManager"
\ No newline at end of file
+private const val TAG = "HeadsUpManager"
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt
index fcb05d3..b4f4138 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt
@@ -108,30 +108,31 @@
private val executor = FakeExecutor(systemClock)
private val huns: ArrayList<NotificationEntry> = ArrayList()
private lateinit var helper: NotificationGroupTestHelper
+
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
helper = NotificationGroupTestHelper(mContext)
- coordinator = HeadsUpCoordinator(
- logger,
- systemClock,
- headsUpManager,
- headsUpViewBinder,
- visualInterruptionDecisionProvider,
- remoteInputManager,
- launchFullScreenIntentProvider,
- flags,
- headerController,
- executor)
+ coordinator =
+ HeadsUpCoordinator(
+ logger,
+ systemClock,
+ headsUpManager,
+ headsUpViewBinder,
+ visualInterruptionDecisionProvider,
+ remoteInputManager,
+ launchFullScreenIntentProvider,
+ flags,
+ headerController,
+ executor
+ )
coordinator.attach(notifPipeline)
// capture arguments:
collectionListener = withArgCaptor {
verify(notifPipeline).addCollectionListener(capture())
}
- notifPromoter = withArgCaptor {
- verify(notifPipeline).addPromoter(capture())
- }
+ notifPromoter = withArgCaptor { verify(notifPipeline).addPromoter(capture()) }
notifLifetimeExtender = withArgCaptor {
verify(notifPipeline).addNotificationLifetimeExtender(capture())
}
@@ -141,9 +142,7 @@
beforeFinalizeFilterListener = withArgCaptor {
verify(notifPipeline).addOnBeforeFinalizeFilterListener(capture())
}
- onHeadsUpChangedListener = withArgCaptor {
- verify(headsUpManager).addListener(capture())
- }
+ onHeadsUpChangedListener = withArgCaptor { verify(headsUpManager).addListener(capture()) }
actionPressListener = withArgCaptor {
verify(remoteInputManager).addActionPressListener(capture())
}
@@ -227,13 +226,13 @@
whenever(headsUpManager.canRemoveImmediately(anyString())).thenReturn(false)
whenever(headsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L)
- assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, /* reason = */ 0))
+ assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, /* reason= */ 0))
actionPressListener.accept(entry)
executor.runAllReady()
verify(endLifetimeExtension, times(1)).onEndLifetimeExtension(notifLifetimeExtender, entry)
- collectionListener.onEntryRemoved(entry, /* reason = */ 0)
+ collectionListener.onEntryRemoved(entry, /* reason= */ 0)
verify(headsUpManager, times(1)).removeNotification(eq(entry.key), any(), anyString())
}
@@ -248,7 +247,7 @@
whenever(headsUpManager.canRemoveImmediately(anyString())).thenReturn(true)
assertFalse(notifLifetimeExtender.maybeExtendLifetime(entry, 0))
- collectionListener.onEntryRemoved(entry, /* reason = */ 0)
+ collectionListener.onEntryRemoved(entry, /* reason= */ 0)
verify(headsUpManager, times(1)).removeNotification(eq(entry.key), any(), anyString())
}
@@ -326,9 +325,8 @@
// THEN only promote the current HUN, mEntry
assertTrue(notifPromoter.shouldPromoteToTopLevel(entry))
- assertFalse(notifPromoter.shouldPromoteToTopLevel(NotificationEntryBuilder()
- .setPkg("test-package2")
- .build()))
+ val testPackage2 = NotificationEntryBuilder().setPkg("test-package2").build()
+ assertFalse(notifPromoter.shouldPromoteToTopLevel(testPackage2))
}
@Test
@@ -338,9 +336,9 @@
// THEN only section the current HUN, mEntry
assertTrue(notifSectioner.isInSection(entry))
- assertFalse(notifSectioner.isInSection(NotificationEntryBuilder()
- .setPkg("test-package")
- .build()))
+ assertFalse(
+ notifSectioner.isInSection(NotificationEntryBuilder().setPkg("test-package").build())
+ )
}
@Test
@@ -350,10 +348,12 @@
// THEN only the current HUN, mEntry, should be lifetimeExtended
assertTrue(notifLifetimeExtender.maybeExtendLifetime(entry, /* cancellationReason */ 0))
- assertFalse(notifLifetimeExtender.maybeExtendLifetime(
- NotificationEntryBuilder()
- .setPkg("test-package")
- .build(), /* cancellationReason */ 0))
+ assertFalse(
+ notifLifetimeExtender.maybeExtendLifetime(
+ NotificationEntryBuilder().setPkg("test-package").build(),
+ /* reason= */ 0
+ )
+ )
}
@Test
@@ -366,8 +366,9 @@
beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(entry))
verify(headsUpManager, never()).showNotification(entry)
withArgCaptor<BindCallback> {
- verify(headsUpViewBinder).bindHeadsUpView(eq(entry), capture())
- }.onBindFinished(entry)
+ verify(headsUpViewBinder).bindHeadsUpView(eq(entry), capture())
+ }
+ .onBindFinished(entry)
// THEN we tell the HeadsUpManager to show the notification
verify(headsUpManager).showNotification(entry)
@@ -545,19 +546,22 @@
collectionListener.onEntryAdded(groupSibling1)
collectionListener.onEntryAdded(groupSibling2)
- val beforeTransformGroup = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupSibling1, groupPriority, groupSibling2))
- .build()
+ val beforeTransformGroup =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupSibling1, groupPriority, groupSibling2))
+ .build()
beforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup))
verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any())
- val afterTransformGroup = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupSibling1, groupSibling2))
- .build()
- beforeFinalizeFilterListener
- .onBeforeFinalizeFilter(listOf(groupPriority, afterTransformGroup))
+ val afterTransformGroup =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupSibling1, groupSibling2))
+ .build()
+ beforeFinalizeFilterListener.onBeforeFinalizeFilter(
+ listOf(groupPriority, afterTransformGroup)
+ )
verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any())
finishBind(groupPriority)
@@ -583,19 +587,22 @@
collectionListener.onEntryUpdated(groupSibling1)
collectionListener.onEntryUpdated(groupSibling2)
- val beforeTransformGroup = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupSibling1, groupPriority, groupSibling2))
- .build()
+ val beforeTransformGroup =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupSibling1, groupPriority, groupSibling2))
+ .build()
beforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup))
verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any())
- val afterTransformGroup = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupSibling1, groupSibling2))
- .build()
- beforeFinalizeFilterListener
- .onBeforeFinalizeFilter(listOf(groupPriority, afterTransformGroup))
+ val afterTransformGroup =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupSibling1, groupSibling2))
+ .build()
+ beforeFinalizeFilterListener.onBeforeFinalizeFilter(
+ listOf(groupPriority, afterTransformGroup)
+ )
verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any())
finishBind(groupPriority)
@@ -618,19 +625,22 @@
collectionListener.onEntryUpdated(groupSummary)
collectionListener.onEntryUpdated(groupPriority)
- val beforeTransformGroup = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupSibling1, groupPriority, groupSibling2))
- .build()
+ val beforeTransformGroup =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupSibling1, groupPriority, groupSibling2))
+ .build()
beforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup))
verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any())
- val afterTransformGroup = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupSibling1, groupSibling2))
- .build()
- beforeFinalizeFilterListener
- .onBeforeFinalizeFilter(listOf(groupPriority, afterTransformGroup))
+ val afterTransformGroup =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupSibling1, groupSibling2))
+ .build()
+ beforeFinalizeFilterListener.onBeforeFinalizeFilter(
+ listOf(groupPriority, afterTransformGroup)
+ )
verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupSummary), any())
finishBind(groupPriority)
@@ -654,19 +664,22 @@
collectionListener.onEntryUpdated(groupSibling1)
collectionListener.onEntryUpdated(groupSibling2)
- val beforeTransformGroup = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupSibling1, groupPriority, groupSibling2))
- .build()
+ val beforeTransformGroup =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupSibling1, groupPriority, groupSibling2))
+ .build()
beforeTransformGroupsListener.onBeforeTransformGroups(listOf(beforeTransformGroup))
verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any())
- val afterTransformGroup = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupSibling1, groupSibling2))
- .build()
- beforeFinalizeFilterListener
- .onBeforeFinalizeFilter(listOf(groupPriority, afterTransformGroup))
+ val afterTransformGroup =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupSibling1, groupSibling2))
+ .build()
+ beforeFinalizeFilterListener.onBeforeFinalizeFilter(
+ listOf(groupPriority, afterTransformGroup)
+ )
finishBind(groupSummary)
verify(headsUpViewBinder, never()).bindHeadsUpView(eq(groupPriority), any())
@@ -688,10 +701,11 @@
collectionListener.onEntryAdded(groupSummary)
collectionListener.onEntryAdded(groupSibling1)
collectionListener.onEntryAdded(groupSibling2)
- val groupEntry = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupSibling1, groupSibling2))
- .build()
+ val groupEntry =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupSibling1, groupSibling2))
+ .build()
beforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupEntry))
verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any())
beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupEntry))
@@ -708,16 +722,16 @@
@Test
fun testNoTransferTwoChildAlert_withGroupAlertAll() {
setShouldHeadsUp(groupSummary)
- whenever(notifPipeline.allNotifs)
- .thenReturn(listOf(groupSummary, groupChild1, groupChild2))
+ whenever(notifPipeline.allNotifs).thenReturn(listOf(groupSummary, groupChild1, groupChild2))
collectionListener.onEntryAdded(groupSummary)
collectionListener.onEntryAdded(groupChild1)
collectionListener.onEntryAdded(groupChild2)
- val groupEntry = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupChild1, groupChild2))
- .build()
+ val groupEntry =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupChild1, groupChild2))
+ .build()
beforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupEntry))
verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any())
beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupEntry))
@@ -742,10 +756,11 @@
collectionListener.onEntryAdded(groupSummary)
collectionListener.onEntryAdded(groupChild1)
collectionListener.onEntryAdded(groupChild2)
- val groupEntry = GroupEntryBuilder()
- .setSummary(groupSummary)
- .setChildren(listOf(groupChild1, groupChild2))
- .build()
+ val groupEntry =
+ GroupEntryBuilder()
+ .setSummary(groupSummary)
+ .setChildren(listOf(groupChild1, groupChild2))
+ .build()
beforeTransformGroupsListener.onBeforeTransformGroups(listOf(groupEntry))
verify(headsUpViewBinder, never()).bindHeadsUpView(any(), any())
beforeFinalizeFilterListener.onBeforeFinalizeFilter(listOf(groupEntry))
@@ -1045,9 +1060,7 @@
.thenReturn(DecisionImpl.of(should))
}
- private fun setDefaultShouldFullScreen(
- originalDecision: FullScreenIntentDecision
- ) {
+ private fun setDefaultShouldFullScreen(originalDecision: FullScreenIntentDecision) {
val provider = visualInterruptionDecisionProvider
whenever(provider.makeUnloggedFullScreenIntentDecision(any())).thenAnswer {
val entry: NotificationEntry = it.getArgument(0)
@@ -1059,11 +1072,8 @@
entry: NotificationEntry,
originalDecision: FullScreenIntentDecision
) {
- whenever(
- visualInterruptionDecisionProvider.makeUnloggedFullScreenIntentDecision(entry)
- ).thenAnswer {
- FullScreenIntentDecisionImpl(entry, originalDecision)
- }
+ whenever(visualInterruptionDecisionProvider.makeUnloggedFullScreenIntentDecision(entry))
+ .thenAnswer { FullScreenIntentDecisionImpl(entry, originalDecision) }
}
private fun verifyLoggedFullScreenIntentDecision(
@@ -1089,7 +1099,8 @@
private fun finishBind(entry: NotificationEntry) {
verify(headsUpManager, never()).showNotification(entry)
withArgCaptor<BindCallback> {
- verify(headsUpViewBinder).bindHeadsUpView(eq(entry), capture())
- }.onBindFinished(entry)
+ verify(headsUpViewBinder).bindHeadsUpView(eq(entry), capture())
+ }
+ .onBindFinished(entry)
}
}