Merge "Set longpress label for small tile to open dialog" into main (4cd94ff9) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -2573,6 +2573,9 @@
		<!-- Accessibility description for long click on a quick settings tile - this is used in the
		context of the sentence "double tap and hold to _Open settings_" [CHAR LIMIT=NONE] -->
		<string name="accessibility_long_click_tile">Open settings</string>
		<!-- Accessibility description for long click on a quick settings tile - this is used in the
		context of the sentence "double tap and hold to _Open more details_" [CHAR LIMIT=NONE] -->
		<string name="accessibility_long_click_tile_details">Open more details</string>

		<!-- Accessibility description of headphones icon [CHAR LIMIT=NONE] -->
		<string name="accessibility_status_bar_headphones">Headphones connected</string>

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt

+8 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import androidx.compose.foundation.layout.width
		import androidx.compose.foundation.shape.RoundedCornerShape
		import androidx.compose.foundation.text.BasicText
		import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
		import androidx.compose.material3.Icon
		import androidx.compose.material3.MaterialTheme
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.DisposableEffect
		@@ -104,7 +103,7 @@ import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.TileEndPadding
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.TileLabelBlurWidth
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.TileStartPadding
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.longPressLabel
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.longPressLabelSettings
		import com.android.systemui.qs.panels.ui.viewmodel.AccessibilityUiState
		import com.android.systemui.qs.ui.compose.borderOnFocus
		import com.android.systemui.res.R
		@@ -137,7 +136,7 @@ fun LargeTileContent(
		modifier = modifier,
		) {
		// Icon
		val longPressLabel = longPressLabel().takeIf { onLongClick != null }
		val longPressLabel = longPressLabelSettings().takeIf { onLongClick != null }
		val animatedBackgroundColor by
		animateColorAsState(colors.iconBackground, label = "QSTileDualTargetBackgroundColor")
		val focusBorderColor = MaterialTheme.colorScheme.secondary
		@@ -422,7 +421,12 @@ object CommonTileDefaults {
		const val TILE_MARQUEE_ITERATIONS = 1
		const val TILE_INITIAL_DELAY_MILLIS = 2000

		@Composable fun longPressLabel() = stringResource(id = R.string.accessibility_long_click_tile)
		@Composable
		fun longPressLabelSettings() = stringResource(id = R.string.accessibility_long_click_tile)

		@Composable
		fun longPressLabelMoreDetails() =
		stringResource(id = R.string.accessibility_long_click_tile_details)
		}

		/** Same as Image, but it doesn't clip its content. */

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt

+4 −2

Original line number	Diff line number	Diff line
		@@ -91,7 +91,8 @@ import com.android.systemui.qs.flags.QsDetailedView
		import com.android.systemui.qs.panels.ui.compose.BounceableInfo
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.InactiveCornerRadius
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.TileHeight
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.longPressLabel
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.longPressLabelMoreDetails
		import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.longPressLabelSettings
		import com.android.systemui.qs.panels.ui.viewmodel.AccessibilityUiState
		import com.android.systemui.qs.panels.ui.viewmodel.DetailsViewModel
		import com.android.systemui.qs.panels.ui.viewmodel.IconProvider
		@@ -397,7 +398,8 @@ fun Modifier.tileCombinedClickable(
		iconOnly: Boolean,
		isDualTarget: Boolean,
		): Modifier {
		val longPressLabel = longPressLabel()
		val longPressLabel =
		if (iconOnly && isDualTarget) longPressLabelMoreDetails() else longPressLabelSettings()
		return combinedClickable(
		onClick = onClick,
		onLongClick = onLongClick,