Merge changes Id312bbfb,I147e1ba5 into main (0ae597a9) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -1203,6 +1203,13 @@ flag {
		}
		}

		flag {
		name: "communal_responsive_grid"
		namespace: "systemui"
		description: "Enables responsive grid on glanceable hub"
		bug: "378171351"
		}

		flag {
		name: "communal_standalone_support"
		namespace: "systemui"

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

+94 −25

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ import androidx.compose.foundation.layout.widthIn
		import androidx.compose.foundation.layout.wrapContentHeight
		import androidx.compose.foundation.lazy.grid.GridCells
		import androidx.compose.foundation.lazy.grid.GridItemSpan
		import androidx.compose.foundation.lazy.grid.LazyGridScope
		import androidx.compose.foundation.lazy.grid.LazyGridState
		import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid
		import androidx.compose.foundation.lazy.grid.itemsIndexed
		@@ -169,6 +170,7 @@ import com.android.compose.modifiers.thenIf
		import com.android.compose.ui.graphics.painter.rememberDrawablePainter
		import com.android.internal.R.dimen.system_app_widget_background_radius
		import com.android.systemui.Flags
		import com.android.systemui.Flags.communalResponsiveGrid
		import com.android.systemui.Flags.communalTimerFlickerFix
		import com.android.systemui.Flags.communalWidgetResizing
		import com.android.systemui.communal.domain.model.CommunalContentModel
		@@ -194,7 +196,6 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.statusbar.phone.SystemUIDialogFactory
		import kotlin.math.max
		import kotlin.math.min
		import kotlin.math.roundToInt
		import kotlinx.coroutines.delay
		import kotlinx.coroutines.launch

		@@ -693,7 +694,12 @@ private fun ResizableItemFrameWrapper(
		onResize = onResize,
		minHeightPx = minHeightPx,
		maxHeightPx = maxHeightPx,
		resizeMultiple = CommunalContentSize.HALF.span,
		resizeMultiple =
		if (communalResponsiveGrid()) {
		1
		} else {
		CommunalContentSize.FixedSize.HALF.span
		},
		) {
		content(Modifier)
		}
		@@ -701,14 +707,22 @@ private fun ResizableItemFrameWrapper(
		}

		@Composable
		fun calculateWidgetSize(item: CommunalContentModel, isResizable: Boolean): WidgetSizeInfo {
		fun calculateWidgetSize(
		cellHeight: Dp?,
		availableHeight: Dp?,
		item: CommunalContentModel,
		isResizable: Boolean,
		): WidgetSizeInfo {
		val density = LocalDensity.current

		val minHeight = cellHeight ?: CommunalContentSize.FixedSize.HALF.dp()
		val maxHeight = availableHeight ?: CommunalContentSize.FixedSize.FULL.dp()

		return if (isResizable && item is CommunalContentModel.WidgetContent.Widget) {
		with(density) {
		val minHeightPx =
		(min(item.providerInfo.minResizeHeight, item.providerInfo.minHeight)
		.coerceAtLeast(CommunalContentSize.HALF.dp().toPx().roundToInt()))
		.coerceAtLeast(minHeight.roundToPx()))

		val maxHeightPx =
		(if (item.providerInfo.maxResizeHeight > 0) {
		@@ -716,7 +730,7 @@ fun calculateWidgetSize(item: CommunalContentModel, isResizable: Boolean): Widge
		} else {
		Int.MAX_VALUE
		})
		.coerceIn(minHeightPx, CommunalContentSize.FULL.dp().toPx().roundToInt())
		.coerceIn(minHeightPx, maxHeight.roundToPx())

		WidgetSizeInfo(minHeightPx, maxHeightPx)
		}
		@@ -725,6 +739,37 @@ fun calculateWidgetSize(item: CommunalContentModel, isResizable: Boolean): Widge
		}
		}

		@Composable
		private fun HorizontalGridWrapper(
		contentPadding: PaddingValues,
		gridState: LazyGridState,
		modifier: Modifier = Modifier,
		content: LazyGridScope.(sizeInfo: SizeInfo?) -> Unit,
		) {
		if (communalResponsiveGrid()) {
		ResponsiveLazyHorizontalGrid(
		cellAspectRatio = 1.5f,
		modifier = modifier,
		state = gridState,
		minContentPadding = contentPadding,
		minHorizontalArrangement = Dimensions.ItemSpacing,
		minVerticalArrangement = Dimensions.ItemSpacing,
		content = content,
		)
		} else {
		LazyHorizontalGrid(
		modifier = modifier,
		state = gridState,
		rows = GridCells.Fixed(CommunalContentSize.FixedSize.FULL.span),
		contentPadding = contentPadding,
		horizontalArrangement = Arrangement.spacedBy(Dimensions.ItemSpacing),
		verticalArrangement = Arrangement.spacedBy(Dimensions.ItemSpacing),
		) {
		content(null)
		}
		}
		}

		@OptIn(ExperimentalFoundationApi::class)
		@Composable
		private fun BoxScope.CommunalHubLazyGrid(
		@@ -778,28 +823,32 @@ private fun BoxScope.CommunalHubLazyGrid(
		// Since the grid has its own listener for in-grid drag events, we use a separate element
		// for android drag events.
		Box(Modifier.fillMaxSize().dragAndDropTarget(dragAndDropTargetState)) {}
		} else if (communalResponsiveGrid()) {
		gridModifier = gridModifier.fillMaxSize()
		} else {
		gridModifier = gridModifier.height(hubDimensions.GridHeight)
		}

		val itemArrangement = Arrangement.spacedBy(Dimensions.ItemSpacing)
		LazyHorizontalGrid(
		HorizontalGridWrapper(
		modifier = gridModifier,
		state = gridState,
		rows = GridCells.Fixed(CommunalContentSize.FULL.span),
		gridState = gridState,
		contentPadding = contentPadding,
		horizontalArrangement = itemArrangement,
		verticalArrangement = itemArrangement,
		) {
		) { sizeInfo ->
		itemsIndexed(
		items = list,
		key = { _, item -> item.key },
		contentType = { _, item -> item.key },
		span = { _, item -> GridItemSpan(item.size.span) },
		span = { _, item -> GridItemSpan(item.getSpanOrMax(sizeInfo?.gridSize?.height)) },
		) { index, item ->
		val size = SizeF(Dimensions.CardWidth.value, item.size.dp().value)
		val currentItemSpan = item.getSpanOrMax(sizeInfo?.gridSize?.height)
		val dpSize =
		if (sizeInfo != null) {
		DpSize(sizeInfo.cellSize.width, sizeInfo.calculateHeight(currentItemSpan))
		} else {
		DpSize(Dimensions.CardWidth, (item.size as CommunalContentSize.FixedSize).dp())
		}
		val size = SizeF(dpSize.width.value, dpSize.height.value)
		val selected = item.key == selectedKey.value
		val dpSize = DpSize(size.width.dp, size.height.dp)
		val isResizable =
		if (item is CommunalContentModel.WidgetContent.Widget) {
		item.providerInfo.resizeMode and AppWidgetProviderInfo.RESIZE_VERTICAL != 0
		@@ -809,7 +858,7 @@ private fun BoxScope.CommunalHubLazyGrid(

		val resizeableItemFrameViewModel =
		rememberViewModel(
		key = item.size.span,
		key = currentItemSpan,
		traceName = "ResizeableItemFrame.viewModel.$index",
		) {
		ResizeableItemFrameViewModel()
		@@ -822,13 +871,23 @@ private fun BoxScope.CommunalHubLazyGrid(
		animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
		label = "Widget resizing outline alpha",
		)
		val widgetSizeInfo = calculateWidgetSize(item, isResizable)

		val widgetSizeInfo =
		calculateWidgetSize(
		cellHeight = sizeInfo?.cellSize?.height,
		availableHeight = sizeInfo?.availableHeight,
		item = item,
		isResizable = isResizable,
		)
		ResizableItemFrameWrapper(
		key = item.key,
		currentSpan = GridItemSpan(item.size.span),
		currentSpan = GridItemSpan(currentItemSpan),
		gridState = gridState,
		gridContentPadding = contentPadding,
		verticalArrangement = itemArrangement,
		verticalArrangement =
		Arrangement.spacedBy(
		sizeInfo?.verticalArrangement ?: Dimensions.ItemSpacing
		),
		enabled = selected,
		alpha = { outlineAlpha },
		modifier =
		@@ -1686,11 +1745,11 @@ private fun beforeContentPadding(paddingValues: PaddingValues): ContentPaddingIn
		}
		}

		private fun CommunalContentSize.dp(): Dp {
		private fun CommunalContentSize.FixedSize.dp(): Dp {
		return when (this) {
		CommunalContentSize.FULL -> Dimensions.CardHeightFull
		CommunalContentSize.HALF -> Dimensions.CardHeightHalf
		CommunalContentSize.THIRD -> Dimensions.CardHeightThird
		CommunalContentSize.FixedSize.FULL -> Dimensions.CardHeightFull
		CommunalContentSize.FixedSize.HALF -> Dimensions.CardHeightHalf
		CommunalContentSize.FixedSize.THIRD -> Dimensions.CardHeightThird
		}
		}

		@@ -1709,7 +1768,10 @@ class Dimensions(val context: Context, val config: Configuration) {
		val GridTopSpacing: Dp
		get() {
		val result =
		if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
		if (
		communalResponsiveGrid() \|\|
		config.orientation == Configuration.ORIENTATION_LANDSCAPE
		) {
		114.dp
		} else {
		val windowMetrics =
		@@ -1729,7 +1791,7 @@ class Dimensions(val context: Context, val config: Configuration) {
		get() = 530.adjustedDp

		val ItemSpacing
		get() = 50.adjustedDp
		get() = if (communalResponsiveGrid()) 32.adjustedDp else 50.adjustedDp

		val CardHeightHalf
		get() = (CardHeightFull - ItemSpacing) / 2
		@@ -1771,6 +1833,13 @@ class Dimensions(val context: Context, val config: Configuration) {

		data class WidgetSizeInfo(val minHeightPx: Int, val maxHeightPx: Int)

		private fun CommunalContentModel.getSpanOrMax(maxSpan: Int?) =
		if (maxSpan != null) {
		size.span.coerceAtMost(maxSpan)
		} else {
		size.span
		}

		private object Colors {
		val DisabledColorFilter by lazy { disabledColorMatrix() }

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

+9 −5

Original line number	Diff line number	Diff line
		@@ -147,9 +147,9 @@ fun ResponsiveLazyHorizontalGrid(
		SizeInfo(
		cellSize = finalSize,
		contentPadding = finalContentPadding,
		horizontalArrangement = minHorizontalArrangement,
		verticalArrangement = minVerticalArrangement,
		maxHeight = maxHeight,
		gridSize = gridSize,
		)
		)
		}
		@@ -176,16 +176,15 @@ private fun calculateClosestSize(maxWidth: Dp, maxHeight: Dp, aspectRatio: Float
		* Provides size info of the responsive grid, since the size is dynamic.
		*
		* @property cellSize The size of each cell in the grid.
		* @property contentPadding The final content padding of the grid.
		* @property horizontalArrangement The space between columns in the grid.
		* @property verticalArrangement The space between rows in the grid.
		* @property gridSize The size of the grid, in cell units.
		* @property availableHeight The maximum height an item in the grid may occupy.
		*/
		data class SizeInfo(
		val cellSize: DpSize,
		val contentPadding: PaddingValues,
		val horizontalArrangement: Dp,
		val verticalArrangement: Dp,
		val gridSize: IntSize,
		private val contentPadding: PaddingValues,
		private val maxHeight: Dp,
		) {
		val availableHeight: Dp
		@@ -193,6 +192,11 @@ data class SizeInfo(
		maxHeight -
		contentPadding.calculateBottomPadding() -
		contentPadding.calculateTopPadding()

		/** Calculates the height in dp of a certain number of rows. */
		fun calculateHeight(numRows: Int): Dp {
		return numRows * cellSize.height + (numRows - 1) * verticalArrangement
		}
		}

		@Composable

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/db/DefaultWidgetPopulationTest.kt

+5 −4

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.communal.data.db.DefaultWidgetPopulation.SkipReason.RESTORED_FROM_BACKUP
		import com.android.systemui.communal.shared.model.SpanValue
		import com.android.systemui.communal.widgets.CommunalWidgetHost
		import com.android.systemui.kosmos.applicationCoroutineScope
		import com.android.systemui.kosmos.testScope
		@@ -117,7 +118,7 @@ class DefaultWidgetPopulationTest : SysuiTestCase() {
		componentName = defaultWidgets[0],
		rank = 0,
		userSerialNumber = 0,
		spanY = 3,
		spanY = SpanValue.Fixed(3),
		)
		verify(communalWidgetDao)
		.addWidget(
		@@ -125,7 +126,7 @@ class DefaultWidgetPopulationTest : SysuiTestCase() {
		componentName = defaultWidgets[1],
		rank = 1,
		userSerialNumber = 0,
		spanY = 3,
		spanY = SpanValue.Fixed(3),
		)
		verify(communalWidgetDao)
		.addWidget(
		@@ -133,7 +134,7 @@ class DefaultWidgetPopulationTest : SysuiTestCase() {
		componentName = defaultWidgets[2],
		rank = 2,
		userSerialNumber = 0,
		spanY = 3,
		spanY = SpanValue.Fixed(3),
		)
		}

		@@ -155,7 +156,7 @@ class DefaultWidgetPopulationTest : SysuiTestCase() {
		componentName = any(),
		rank = anyInt(),
		userSerialNumber = anyInt(),
		spanY = anyInt(),
		spanY = any(),
		)
		}
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryLocalImplTest.kt

+223 −104

File changed.

Preview size limit exceeded, changes collapsed.