Merge "Preventing GH container from being focusable if bouncer is on screen" into main (07102086) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import androidx.compose.ui.graphics.Brush
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.semantics.clearAndSetSemantics
		import androidx.compose.ui.semantics.contentDescription
		import androidx.compose.ui.semantics.disabled
		import androidx.compose.ui.semantics.semantics
		import androidx.compose.ui.unit.dp
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		@@ -243,7 +243,7 @@ private fun SceneScope.CommunalScene(
		if (isFocusable) {
		Modifier.focusable()
		} else {
		Modifier.semantics { contentDescription = "" }.clearAndSetSemantics {}
		Modifier.semantics { disabled() }.clearAndSetSemantics {}
		}
		)
		) {
		@@ -259,7 +259,7 @@ private fun SceneScope.CommunalScene(
		modifier =
		modifier.focusable(isFocusable).semantics {
		if (!isFocusable) {
		contentDescription = ""
		disabled()
		}
		}
		)