summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-01-12 20:55:17 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-01-12 20:55:17 +0000
commita032e2153326bedcf21f234b10f6b5c82feefe6f (patch)
treeb3a40496d03588059f2e4fc4f56941e247b9a358
parent4d8d73ebaf29bcb79547ced8ef834aa1fd8b3d7c (diff)
parent41ed171f6ee97dfac3179fe39c6eeef6ce210387 (diff)
Merge "Remove unnecessary animation code that causes crashes" into main
-rw-r--r--packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt14
1 files changed, 0 insertions, 14 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt
index 0eec024d3c81..0b26ae96de54 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt
@@ -43,10 +43,7 @@ import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import com.android.compose.animation.scene.ElementKey
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.SharedValues.SharedExpansionValue
import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel
object Notifications {
@@ -56,10 +53,6 @@ object Notifications {
val ShelfSpace = ElementKey("ShelfSpace")
}
- object SharedValues {
- val SharedExpansionValue = ValueKey("SharedExpansionValue")
- }
-
enum class Form {
HunFromTop,
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 {
if (viewModel.isPlaceholderTextVisible) {
Box(Modifier.fillMaxSize()) {