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

Commit 41ed171f authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Remove unnecessary animation code that causes crashes

Bug: 296118689
Test: build and test with FLEXI_NOTIFS=true
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Change-Id: If7b0c99887dc2b3787b63119735c66ca4da71f96
parent dbd941f7
Loading
Loading
Loading
Loading
+0 −14
Original line number Original line Diff line number Diff line
@@ -43,10 +43,7 @@ import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.dp
import com.android.compose.animation.scene.ElementKey
import com.android.compose.animation.scene.ElementKey
import com.android.compose.animation.scene.SceneScope
import com.android.compose.animation.scene.SceneScope
import com.android.compose.animation.scene.ValueKey
import com.android.compose.animation.scene.animateElementFloatAsState
import com.android.systemui.notifications.ui.composable.Notifications.Form
import com.android.systemui.notifications.ui.composable.Notifications.Form
import com.android.systemui.notifications.ui.composable.Notifications.SharedValues.SharedExpansionValue
import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel
import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel


object Notifications {
object Notifications {
@@ -56,10 +53,6 @@ object Notifications {
        val ShelfSpace = ElementKey("ShelfSpace")
        val ShelfSpace = ElementKey("ShelfSpace")
    }
    }


    object SharedValues {
        val SharedExpansionValue = ValueKey("SharedExpansionValue")
    }

    enum class Form {
    enum class Form {
        HunFromTop,
        HunFromTop,
        Stack,
        Stack,
@@ -181,13 +174,6 @@ private fun SceneScope.NotificationPlaceholder(
                    )
                    )
                }
                }
    ) {
    ) {
        val animatedExpansion by
            animateElementFloatAsState(
                value = if (form == Form.HunFromTop) 0f else 1f,
                key = SharedExpansionValue
            )
        debugLog(viewModel) { "STACK composed: expansion=$animatedExpansion" }

        content {
        content {
            if (viewModel.isPlaceholderTextVisible) {
            if (viewModel.isPlaceholderTextVisible) {
                Box(Modifier.fillMaxSize()) {
                Box(Modifier.fillMaxSize()) {