Merge "Fix Drag and drop bug when moving a tile within the current list" into main (ef2629a5) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeViewModelTest.kt

+77 −21

Original line number	Diff line number	Diff line
		@@ -54,8 +54,10 @@ import com.android.systemui.qs.tiles.viewmodel.qSTileConfigProvider
		import com.android.systemui.settings.userTracker
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.flowOf
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		@@ -103,9 +105,7 @@ class EditModeViewModelTest(flags: FlagsParameterization) : SysuiTestCase() {
		appName2,
		)

		private val underTest: EditModeViewModel by lazy {
		kosmos.editModeViewModel
		}
		private val underTest: EditModeViewModel by lazy { kosmos.editModeViewModel }

		@Before
		fun setUp() {
		@@ -461,14 +461,17 @@ class EditModeViewModelTest(flags: FlagsParameterization) : SysuiTestCase() {
		}

		@Test
		fun tileNotAvailable_notShowing() = with(kosmos) {
		fun tileNotAvailable_notShowing() =
		with(kosmos) {
		testScope.runTest {
		val unavailableTile = "work"
		qsTileFactory = FakeQSFactory { spec ->
		FakeQSTile(userTracker.userId, spec != unavailableTile)
		}
		tileAvailabilityInteractorsMap = mapOf(
		unavailableTile to FakeTileAvailabilityInteractor(
		tileAvailabilityInteractorsMap =
		mapOf(
		unavailableTile to
		FakeTileAvailabilityInteractor(
		emptyMap<Int, Flow<Boolean>>().withDefault { flowOf(false) }
		)
		)
		@@ -483,7 +486,60 @@ class EditModeViewModelTest(flags: FlagsParameterization) : SysuiTestCase() {

		underTest.startEditing()

		assertThat(tiles!!.none { it.tileSpec == TileSpec.create(unavailableTile) }).isTrue()
		assertThat(tiles!!.none { it.tileSpec == TileSpec.create(unavailableTile) })
		.isTrue()
		}
		}

		@OptIn(ExperimentalCoroutinesApi::class)
		@Test
		fun currentTiles_moveTileDown() =
		with(kosmos) {
		testScope.runTest {
		val tiles by collectLastValue(underTest.tiles)
		val currentTiles =
		mutableListOf(
		TileSpec.create("flashlight"),
		TileSpec.create("airplane"),
		TileSpec.create("internet"),
		TileSpec.create("alarm"),
		)
		currentTilesInteractor.setTiles(currentTiles)
		underTest.startEditing()
		runCurrent()

		// Move flashlight tile to index 3
		underTest.addTile(TileSpec.create("flashlight"), 3)

		assertThat(tiles!!.filter { it.isCurrent }.map { it.tileSpec.spec })
		.containsExactly("airplane", "internet", "alarm", "flashlight")
		.inOrder()
		}
		}

		@OptIn(ExperimentalCoroutinesApi::class)
		@Test
		fun currentTiles_moveTileUp() =
		with(kosmos) {
		testScope.runTest {
		val tiles by collectLastValue(underTest.tiles)
		val currentTiles =
		mutableListOf(
		TileSpec.create("flashlight"),
		TileSpec.create("airplane"),
		TileSpec.create("internet"),
		TileSpec.create("alarm"),
		)
		currentTilesInteractor.setTiles(currentTiles)
		underTest.startEditing()
		runCurrent()

		// Move alarm tile to index 0
		underTest.addTile(TileSpec.create("alarm"), 0)

		assertThat(tiles!!.filter { it.isCurrent }.map { it.tileSpec.spec })
		.containsExactly("alarm", "flashlight", "airplane", "internet")
		.inOrder()
		}
		}

packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeViewModel.kt

+44 −39

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import com.android.systemui.qs.pipeline.domain.interactor.CurrentTilesInteractor
		import com.android.systemui.qs.pipeline.domain.interactor.CurrentTilesInteractor.Companion.POSITION_AT_END
		import com.android.systemui.qs.pipeline.domain.interactor.MinimumTilesInteractor
		import com.android.systemui.qs.pipeline.shared.TileSpec
		import javax.inject.Inject
		import javax.inject.Named
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.MutableStateFlow
		@@ -37,8 +39,6 @@ import kotlinx.coroutines.flow.emptyFlow
		import kotlinx.coroutines.flow.flatMapLatest
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.flow.stateIn
		import javax.inject.Inject
		import javax.inject.Named

		@SysUISingleton
		@OptIn(ExperimentalCoroutinesApi::class)
		@@ -93,8 +93,10 @@ constructor(
		val editTilesData = editTilesListInteractor.getTilesToEdit()
		// Query only the non current platform tiles, as any current tile is clearly
		// available
		val unavailable = tilesAvailabilityInteractor.getUnavailableTiles(
		editTilesData.stockTiles.map { it.tileSpec }
		val unavailable =
		tilesAvailabilityInteractor.getUnavailableTiles(
		editTilesData.stockTiles
		.map { it.tileSpec }
		.minus(currentTilesInteractor.currentTilesSpecs.toSet())
		)
		currentTilesInteractor.currentTiles.map { tiles ->
		@@ -144,13 +146,16 @@ constructor(
		_isEditing.value = false
		}

		/** Immediately moves [tileSpec] to [position]. */
		fun moveTile(tileSpec: TileSpec, position: Int) {
		throw NotImplementedError("This is not supported yet")
		/**
		* Immediately adds [tileSpec] to the current tiles at [position]. If the [tileSpec] was already
		* present, it will be moved to the new position.
		*/
		fun addTile(tileSpec: TileSpec, position: Int = POSITION_AT_END) {
		// Removing tile if it's already present to insert it at the new index.
		if (currentTilesInteractor.currentTilesSpecs.contains(tileSpec)) {
		removeTile(tileSpec)
		}

		/** Immediately adds [tileSpec] to the current tiles at [position]. */
		fun addTile(tileSpec: TileSpec, position: Int = POSITION_AT_END) {
		currentTilesInteractor.addTile(tileSpec, position)
		}