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

Commit ec11f527 authored by Tianfan Zhang's avatar Tianfan Zhang
Browse files

Fix UI bugs shown on unfolded devices. When unfolded device is rorated, 

the cue bar UI is abnormal, screenshots can be found in the relavant bug.

Bug: 442464301
Test: local
Flag: EXEMPT bugfix
Change-Id: I88a32bbe84fd9f5616029594814f22f418b36617
parent 1b2e5218

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/ActionList.kt

+2 −2
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ fun ActionList( 
                            val chipsTotalHeightPx =

                                childHeights.sum().toFloat() +

                                    columnSpacingPx * (childHeights.size - 1)

                            if (portrait) {

                            if (portrait || taskBarMode) {

                                translationY = (1f - translation) * appxColumnY

                                translationX = 0f

                            } else {
@@ -431,7 +431,7 @@ fun ActionList( 
                            scaleX = scale

                            scaleY = scale

                            transformOrigin =

                                if (portrait) {

                                if (portrait || taskBarMode) {

                                    TransformOrigin(0.5f, 1f)

                                } else {

                                    if (rotation == ROTATION_90) {

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/AmbientCueContainer.kt

+4 −3
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ private fun TaskBarAnd3ButtonAmbientCue( 
    }

    val content = LocalContext.current

    val rotation = content.display.rotation

    if (largeScreen && rotation == ROTATION_270) return



    ActionList(

        actions = actions,
@@ -173,7 +174,7 @@ private fun TaskBarAnd3ButtonAmbientCue( 
        showEducation = viewModel.showLongPressEducation,

        modifier =

            modifier.graphicsLayer {

                if (portrait) {

                if (portrait || largeScreen) {

                    translationX = screenWidthPx - size.width

                    translationY = pillCenter.y - size.height

                } else {
@@ -187,7 +188,7 @@ private fun TaskBarAnd3ButtonAmbientCue( 
                }

            },

        padding =

            if (portrait) {

            if (portrait || largeScreen) {

                PaddingValues(

                    start = ACTIONS_HORIZONTAL_PADDING.dp,

                    end = ACTIONS_HORIZONTAL_PADDING.dp,
@@ -210,7 +211,7 @@ private fun TaskBarAnd3ButtonAmbientCue( 
    ShortPill(

        actions = actions,

        visible = visible,

        horizontal = portrait,

        horizontal = portrait || largeScreen,

        expanded = expanded,

        rotation = rotation,

        taskBarMode = largeScreen,