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

Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: 9c0ada2858

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I1e3165fcf852e96653f0aedef2e79093d66fd0e1
This commit is contained in:
TreeHugger Robot
2020-06-18 23:55:29 +00:00
committed by Automerger Merge Worker
parent 7cd082924e 9c0ada2858
commit dafdfb6ea1
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/bubbles/storage/BubbleVolatileRepository.kt
View File

@@ -60,7 +60,8 @@ class BubbleVolatileRepository @Inject constructor(
// Verify the size of given bubbles is within capacity, otherwise trim down to capacity // Verify the size of given bubbles is within capacity, otherwise trim down to capacity
val bubblesInRange = bubbles.takeLast(capacity) val bubblesInRange = bubbles.takeLast(capacity)
// To ensure natural ordering of the bubbles, removes bubbles which already exist // To ensure natural ordering of the bubbles, removes bubbles which already exist
val uniqueBubbles = bubblesInRange.filterNot { entities.remove(it) } val uniqueBubbles = bubblesInRange.filterNot { b: BubbleEntity ->
entities.removeIf { e: BubbleEntity -> b.key == e.key } }
val overflowCount = entities.size + bubblesInRange.size - capacity val overflowCount = entities.size + bubblesInRange.size - capacity
if (overflowCount > 0) { if (overflowCount > 0) {
// Uncache ShortcutInfo of bubbles that will be removed due to capacity // Uncache ShortcutInfo of bubbles that will be removed due to capacity
@@ -72,7 +73,9 @@ class BubbleVolatileRepository @Inject constructor(
} }
@Synchronized @Synchronized
fun removeBubbles(bubbles: List<BubbleEntity>) = uncache(bubbles.filter { entities.remove(it) }) fun removeBubbles(bubbles: List<BubbleEntity>) =
uncache(bubbles.filter { b: BubbleEntity ->
entities.removeIf { e: BubbleEntity -> b.key == e.key } })
private fun cache(bubbles: List<BubbleEntity>) { private fun cache(bubbles: List<BubbleEntity>) {
bubbles.groupBy { ShortcutKey(it.userId, it.packageName) }.forEach { (key, bubbles) -> bubbles.groupBy { ShortcutKey(it.userId, it.packageName) }.forEach { (key, bubbles) ->

13
packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubbleVolatileRepositoryTest.kt
View File

@@ -102,6 +102,19 @@ class BubbleVolatileRepositoryTest : SysuiTestCase() {
eq(listOf("alice and bob")), eq(user10), eq(listOf("alice and bob")), eq(user10),
eq(LauncherApps.FLAG_CACHE_BUBBLE_SHORTCUTS)) eq(LauncherApps.FLAG_CACHE_BUBBLE_SHORTCUTS))
} }
@Test
fun testAddBubbleMatchesByKey() {
val bubble = BubbleEntity(0, "com.example.pkg", "shortcut-id", "key", 120, 0, "title")
repository.addBubbles(listOf(bubble))
assertEquals(bubble, repository.bubbles.get(0))
// Same key as first bubble but different entry
val bubbleModified = BubbleEntity(0, "com.example.pkg", "shortcut-id", "key", 120, 0,
"different title")
repository.addBubbles(listOf(bubbleModified))
assertEquals(bubbleModified, repository.bubbles.get(0))
}
} }
private const val PKG_MESSENGER = "com.example.messenger" private const val PKG_MESSENGER = "com.example.messenger"