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

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

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

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

@@ -139,14 +139,23 @@ private fun PeopleScreenWithConversations(
bottom = PeopleSpacePadding, bottom = PeopleSpacePadding,
start = 8.dp, start = 8.dp,
end = 8.dp, end = 8.dp,
) ),
) { ) {
val hasPriorityConversations = priorityTiles.isNotEmpty()
if (hasPriorityConversations) {
ConversationList(R.string.priority_conversations, priorityTiles, onTileClicked) ConversationList(R.string.priority_conversations, priorityTiles, onTileClicked)
}
if (recentTiles.isNotEmpty()) {
if (hasPriorityConversations) {
item { Spacer(Modifier.height(35.dp)) } item { Spacer(Modifier.height(35.dp)) }
}
ConversationList(R.string.recent_conversations, recentTiles, onTileClicked) ConversationList(R.string.recent_conversations, recentTiles, onTileClicked)
} }
} }
} }
}
private fun LazyListScope.ConversationList( private fun LazyListScope.ConversationList(
@StringRes headerTextResource: Int, @StringRes headerTextResource: Int,