Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8142b837 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Fix PeopleSpace when showing only priority or recent conversations... 

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

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



Change-Id: Ide1a98ecada9661c9e4bb25b5a54840be89d3f02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6feb852c d5a4b9e5

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

+13 −4
Original line number Diff line number Diff line
@@ -139,14 +139,23 @@ private fun PeopleScreenWithConversations( 
                    bottom = PeopleSpacePadding,

                    start = 8.dp,

                    end = 8.dp,

                )

                ),

        ) {

            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)

            }

        }

    }

}



private fun LazyListScope.ConversationList(

    @StringRes headerTextResource: Int,