commit cc086f8d38cdf326a8abce1b9aa34a0756491834
author Yein Jo <yeinj@google.com> Tue Feb 21 22:53:28 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 21 22:53:28 2023 +0000
tree e3f2d7f77d23b8756cb036e7c1ee2f3f189a3bbd
parent e7b3665873b99f36e5b009a98806b122759a3f35
parent 8e869dce13ee6605178ab27034df1e0f63fb22b9

Merge "Fix failing RippleShaderTest" into tm-qpr-dev

packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt

diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt
index aad2d70..0b842ad 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt
+++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt
@@ -431,8 +431,9 @@
                             "[setSizeAtProgresses] before playing the animation."
                     )
                 }
-                // If there's no size is set, we set everything to 0.
+                // If there's no size is set, we set everything to 0 and return early.
                 setSizeAtProgresses(initialSize)
+                return currentSizeIndex
             }
 
             var candidate = sizes[currentSizeIndex]