summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jordan Demeulenaere <jdemeulenaere@google.com> 2022-12-21 11:41:28 +0100
committer Jordan Demeulenaere <jdemeulenaere@google.com> 2022-12-21 15:00:01 +0100
commit028d793955fd35846f33bd81853d779e623d4a77 (patch)
treeb1d3d0ec8017319e006ef3c278f4afeeef97709d
parentff576d73419fc06ae3d8abcd899a7a68f7829a2d (diff)
Fix PeopleSpace when showing only priority or recent conversations (1/2)
Bug: 238993727 Test: atest PeopleSpaceScreenshotTest Change-Id: I273859b1b8173d7feb329114e59d242e0a0dfb45
-rw-r--r--packages/SystemUI/compose/features/src/com/android/systemui/people/ui/compose/PeopleScreen.kt17
1 files changed, 13 insertions, 4 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/people/ui/compose/PeopleScreen.kt b/packages/SystemUI/compose/features/src/com/android/systemui/people/ui/compose/PeopleScreen.kt
index 2aac46e90342..4a56b027e07c 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/people/ui/compose/PeopleScreen.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/people/ui/compose/PeopleScreen.kt
@@ -139,11 +139,20 @@ private fun PeopleScreenWithConversations(
bottom = PeopleSpacePadding,
start = 8.dp,
end = 8.dp,
- )
+ ),
) {
- ConversationList(R.string.priority_conversations, priorityTiles, onTileClicked)
- item { Spacer(Modifier.height(35.dp)) }
- ConversationList(R.string.recent_conversations, recentTiles, onTileClicked)
+ val hasPriorityConversations = priorityTiles.isNotEmpty()
+ if (hasPriorityConversations) {
+ ConversationList(R.string.priority_conversations, priorityTiles, onTileClicked)
+ }
+
+ if (recentTiles.isNotEmpty()) {
+ if (hasPriorityConversations) {
+ item { Spacer(Modifier.height(35.dp)) }
+ }
+
+ ConversationList(R.string.recent_conversations, recentTiles, onTileClicked)
+ }
}
}
}