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

Merge "Controls UI - Do not save empty structures" into rvc-dev am: 55bd691d2b

Browse Source 
Change-Id: I193d6453719a02cf2fb62743a90518178fee5778
This commit is contained in:
Automerger Merge Worker
2020-03-10 16:35:01 +00:00
parent 02ac81a897 55bd691d2b
commit 99532ba1d9
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/controls/controller/ControlsControllerImpl.kt
View File

@@ -493,10 +493,12 @@ private object Favorites {
updatedStructure
} else { s }
structures.add(newStructure)
if (!newStructure.controls.isEmpty()) {
structures.add(newStructure)
}
}
if (!replaced) {
if (!replaced && !updatedStructure.controls.isEmpty()) {
structures.add(updatedStructure)
}

12
packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsControllerImplTest.kt
View File

@@ -521,7 +521,7 @@ class ControlsControllerImplTest : SysuiTestCase() {
}
@Test
fun testReplaceFavoritesForStructure_noFavorites() {
fun testReplaceFavoritesForStructure_noExistingFavorites() {
controller.replaceFavoritesForStructure(TEST_STRUCTURE_INFO)
delayableExecutor.runAllReady()
@@ -530,6 +530,16 @@ class ControlsControllerImplTest : SysuiTestCase() {
controller.getFavoritesForComponent(TEST_COMPONENT))
}
@Test
fun testReplaceFavoritesForStructure_doNotStoreEmptyStructure() {
controller.replaceFavoritesForStructure(
StructureInfo(TEST_COMPONENT, "Home", emptyList<ControlInfo>()))
delayableExecutor.runAllReady()
assertEquals(0, controller.countFavoritesForComponent(TEST_COMPONENT))
assertEquals(emptyList<ControlInfo>(), controller.getFavoritesForComponent(TEST_COMPONENT))
}
@Test
fun testReplaceFavoritesForStructure_differentComponentsAreFilteredOut() {
controller.replaceFavoritesForStructure(TEST_STRUCTURE_INFO)