commit d5a4b9e514fecfcac7de4f8a5d1b63372602afd6
author Jordan Demeulenaere <jdemeulenaere@google.com> Fri Dec 23 13:22:35 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 23 13:22:35 2022 +0000
tree 9ce8113ba2213c052c14a84215eaf76a40a61a49
parent f9748a4c24ef7bfd796f0ea4f312bf4fbd7d2c33
parent 028d793955fd35846f33bd81853d779e623d4a77

Merge "Fix PeopleSpace when showing only priority or recent conversations (1/2)" into tm-qpr-dev

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

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 2aac46e..4a56b02 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 @@
                     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)
+            }
         }
     }
 }