Merge "Fix failing RippleShaderTest" into tm-qpr-dev am: cc086f8d38
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21527671 Change-Id: I5690ea401b0e10486bc2c989a441b7f26d7ee3c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -431,8 +431,9 @@ class RippleShader(rippleShape: RippleShape = RippleShape.CIRCLE) :
|
|||||||
"[setSizeAtProgresses] before playing the animation."
|
"[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)
|
setSizeAtProgresses(initialSize)
|
||||||
|
return currentSizeIndex
|
||||||
}
|
}
|
||||||
|
|
||||||
var candidate = sizes[currentSizeIndex]
|
var candidate = sizes[currentSizeIndex]
|
||||||
|
|||||||
Reference in New Issue
Block a user