Merge "People Screen now has window insets." into main (69c57057) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/people/ui/compose/PeopleScreen.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.height
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.size
		import androidx.compose.foundation.layout.safeContentPadding
		import androidx.compose.foundation.rememberScrollState
		import androidx.compose.foundation.shape.RoundedCornerShape
		import androidx.compose.foundation.verticalScroll
		@@ -95,7 +96,9 @@ private fun PeopleScreenWithConversations(
		recentTiles: List<PeopleTileViewModel>,
		onTileClicked: (PeopleTileViewModel) -> Unit,
		) {
		Column(Modifier.sysuiResTag("top_level_with_conversations")) {
		Column(
		Modifier.fillMaxSize().safeContentPadding().sysuiResTag("top_level_with_conversations")
		) {
		Column(
		Modifier.fillMaxWidth().padding(PeopleSpacePadding),
		horizontalAlignment = Alignment.CenterHorizontally,

+2 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.height
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.size
		import androidx.compose.foundation.layout.width
		import androidx.compose.foundation.layout.safeContentPadding
		import androidx.compose.foundation.shape.RoundedCornerShape
		import androidx.compose.material3.Button
		import androidx.compose.material3.ButtonDefaults
		@@ -47,7 +48,7 @@ import com.android.systemui.res.R
		@Composable
		internal fun PeopleScreenEmpty(onGotItClicked: () -> Unit) {
		Column(
		Modifier.fillMaxSize().padding(PeopleSpacePadding),
		Modifier.fillMaxSize().safeContentPadding().padding(PeopleSpacePadding),
		horizontalAlignment = Alignment.CenterHorizontally,
		) {
		Text(