Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20795170

Change-Id: Ia104922780da511efb320f6908889359368ecad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jordan Demeulenaere
2022-12-23 14:41:01 +00:00
committed by Automerger Merge Worker
parent bb9bd421f7 8142b837a2
commit ab979cf06d
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)
}
}
}
}