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

Commit 88ac5e14 authored by burakov's avatar burakov
Browse files

[Dual Shade] Fix the text feedback chip alignment, and improve animation 

Fix: 425925687
Test: Tested manually by toggling the flashlight tile and observing the
 text feedback chip appearing and disappearing correctly.
Flag: com.android.systemui.scene_container
Change-Id: I2a1a49d18ed307f96648bd59163196e132af404e
parent 1b827075

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/toolbar/Toolbar.kt

+3 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.qs.panels.ui.compose.toolbar 


import androidx.compose.animation.AnimatedContent

import androidx.compose.animation.AnimatedContentScope

import androidx.compose.animation.Crossfade

import androidx.compose.animation.ExperimentalSharedTransitionApi

import androidx.compose.animation.SharedTransitionLayout

import androidx.compose.animation.SharedTransitionScope
@@ -135,7 +134,7 @@ private fun SharedTransitionScope.StandardToolbarLayout( 
        ToolbarTextFeedback(

            viewModelFactory = viewModel.textFeedbackContentViewModelFactory,

            buildNumberViewModelFactory = viewModel.buildNumberViewModelFactory,

            modifier = Modifier.weight(1f),

            modifier = Modifier.weight(1f).align(Alignment.CenterVertically),

        )

    }

}
@@ -187,10 +186,10 @@ private fun ToolbarTextFeedback( 
            }

        val hasTextFeedback = viewModel.textFeedback !is TextFeedbackViewModel.NoFeedback



        Crossfade(

        AnimatedContent(

            targetState = hasTextFeedback,

            modifier = Modifier.align(Alignment.Center),

            label = "Toolbar.ShowTextFeedback",

            label = "Toolbar.ToolbarTextFeedback",

        ) { showTextFeedback ->

            if (showTextFeedback) {

                TextFeedback(model = viewModel.textFeedback)