Merge "Controls UI - Do not save empty structures" into rvc-dev (55bd691d) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -493,10 +493,12 @@ private object Favorites {
		updatedStructure
		} else { s }

		if (!newStructure.controls.isEmpty()) {
		structures.add(newStructure)
		}
		}

		if (!replaced) {
		if (!replaced && !updatedStructure.controls.isEmpty()) {
		structures.add(updatedStructure)
		}

+11 −1

Original line number	Diff line number	Diff line
		@@ -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)