Merge "Revert "Keep selection of widget at the end of widget dragging"" into main (e002ff0a) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt

+3 −5

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ internal constructor(
		private val scope: CoroutineScope,
		private val updateDragPositionForRemove: (draggingBoundingBox: IntRect) -> Boolean,
		) {
		var draggingItemKey by mutableStateOf<String?>(null)
		var draggingItemKey by mutableStateOf<Any?>(null)
		private set

		var isDraggingToRemove by mutableStateOf(false)
		@@ -138,7 +138,7 @@ internal constructor(
		// before content padding from the initial pointer position
		.firstItemAtOffset(normalizedOffset - contentOffset)
		?.apply {
		draggingItemKey = key as String
		draggingItemKey = key
		draggingItemInitialOffset = this.offset.toOffset()
		return true
		}
		@@ -284,9 +284,7 @@ fun Modifier.dragContainer(
		contentOffset,
		)
		) {
		// draggingItemKey is guaranteed to be non-null here because it is set in
		// onDragStart()
		viewModel.onReorderWidgetStart(dragDropState.draggingItemKey!!)
		viewModel.onReorderWidgetStart()
		}
		},
		onDragEnd = {

+6 −6

Original line number	Diff line number	Diff line
		@@ -172,16 +172,16 @@ class CommunalEditModeViewModelTest : SysuiTestCase() {
		}

		@Test
		fun selectedKey_onReorderWidgets_isSet() =
		fun selectedKey_onReorderWidgets_isCleared() =
		testScope.runTest {
		val selectedKey by collectLastValue(underTest.selectedKey)

		underTest.setSelectedKey(null)
		assertThat(selectedKey).isNull()

		val key = CommunalContentModel.KEY.widget(123)
		underTest.onReorderWidgetStart(key)
		underTest.setSelectedKey(key)
		assertThat(selectedKey).isEqualTo(key)

		underTest.onReorderWidgetStart()
		assertThat(selectedKey).isNull()
		}

		@Test
		@@ -234,7 +234,7 @@ class CommunalEditModeViewModelTest : SysuiTestCase() {

		@Test
		fun reorderWidget_uiEventLogging_start() {
		underTest.onReorderWidgetStart(CommunalContentModel.KEY.widget(123))
		underTest.onReorderWidgetStart()
		verify(uiEventLogger).log(CommunalUiEvent.COMMUNAL_HUB_REORDER_WIDGET_START)
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ abstract class BaseCommunalViewModel(
		open fun onDismissCtaTile() {}

		/** Called as the user starts dragging a widget to reorder. */
		open fun onReorderWidgetStart(draggingItemKey: String) {}
		open fun onReorderWidgetStart() {}

		/** Called as the user finishes dragging a widget to reorder. */
		open fun onReorderWidgetEnd() {}

+3 −2

Original line number	Diff line number	Diff line
		@@ -164,8 +164,9 @@ constructor(
		)
		}

		override fun onReorderWidgetStart(draggingItemKey: String) {
		setSelectedKey(draggingItemKey)
		override fun onReorderWidgetStart() {
		// Clear selection status
		setSelectedKey(null)
		_reorderingWidgets.value = true
		uiEventLogger.log(CommunalUiEvent.COMMUNAL_HUB_REORDER_WIDGET_START)
		}