| commit | a33f59333b54f7bb1c6c750a6a759bffdde834a0 | [log] [tgz] |
|---|---|---|
| author | Yein Jo <yeinj@google.com> | Wed Feb 22 00:13:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 22 00:13:02 2023 +0000 |
| tree | e15750bad2a750df9f183a12ce9f5d73e81fb33a | |
| parent | 7b33943890b7eca5fef098b1d42a054df9031fbf [diff] | |
| parent | 6c23ef9819ab2e36d0e8b1fbd4a1dcdc63104f24 [diff] |
Merge "Fix failing RippleShaderTest" into tm-qpr-dev am: cc086f8d38 am: 6c23ef9819 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21527671 Change-Id: I5ffafb961df5bbe3f2d610487a4cb4ea28dbb031 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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]