commit 5f1bf3104b6373607da8b92169b397fcdc5ff77d
author Hawkwood Glazier <jglazier@google.com> Thu Apr 13 19:04:48 2023 +0000
committer Hawkwood Glazier <jglazier@google.com> Mon Apr 17 16:48:29 2023 +0000
tree 97f6d427cf492e9c76a372fe1c66523c74b50391
parent cd6f960604d2c31a034a1b69a34188093ff33342

Update animations to be per clock-face

Bug: 276733633
Test: Manually checked carousel animation
Change-Id: I992515df260319e63d086ec81a58f0a87270c77e

src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt

diff --git a/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt b/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
index a27d019..a2d5aec 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt
@@ -98,11 +98,11 @@
                     endId: Int,
                     progress: Float
                 ) {
-                    scalingDownClockController.animations.onPickerCarouselSwiping(
+                    scalingDownClockController.largeClock.animations.onPickerCarouselSwiping(
                         1 - progress,
                         getPreviewRatio()
                     )
-                    scalingUpClockController.animations.onPickerCarouselSwiping(
+                    scalingUpClockController.largeClock.animations.onPickerCarouselSwiping(
                         progress,
                         getPreviewRatio()
                     )
@@ -173,6 +173,7 @@
                 clockScaleView.scaleX = CLOCK_CAROUSEL_VIEW_SCALE
                 clockScaleView.scaleY = CLOCK_CAROUSEL_VIEW_SCALE
                 onGetClockController(clockIds[index])
+                    .largeClock
                     .animations
                     .onPickerCarouselSwiping(0F, getPreviewRatio())
             } else {
@@ -180,6 +181,7 @@
                 clockScaleView.scaleX = 1f
                 clockScaleView.scaleY = 1f
                 onGetClockController(clockIds[index])
+                    .largeClock
                     .animations
                     .onPickerCarouselSwiping(1F, getPreviewRatio())
             }