diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-17 01:04:40 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-17 01:04:40 +0000 |
commit | 5bd82a31e74180998dd1c0da305c169677da333c (patch) | |
tree | 05fe4bbf03603703931670dfb2e19f7173e88ef9 | |
parent | 0041c527faecb7a7b748789d47eaedc7be1b735a (diff) | |
parent | 8ded831b9255a5807bc24a1455d332963f333232 (diff) | |
download | lottie-android12-s2-release.tar.gz |
Snap for 7464903 from 8ded831b9255a5807bc24a1455d332963f333232 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: Ifa4aeaa06c663a17f42005c7c1dba3dccd3b040b
-rw-r--r-- | lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java index 8cd45bac..5ba38ba6 100644 --- a/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java +++ b/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java @@ -137,8 +137,27 @@ class KeyframeParser { interpolator = interpolatorRef.get(); } if (interpolatorRef == null || interpolator == null) { - interpolator = PathInterpolatorCompat.create( - cp1.x / scale, cp1.y / scale, cp2.x / scale, cp2.y / scale); + cp1.x /= scale; + cp1.y /= scale; + cp2.x /= scale; + cp2.y /= scale; + try { + interpolator = PathInterpolatorCompat.create(cp1.x, cp1.y, cp2.x, cp2.y); + } catch (IllegalArgumentException e) { + if (e.getMessage().equals("The Path cannot loop back on itself.")) { + // If a control point extends beyond the previous/next point then it + // will cause the value of the interpolator to no longer monotonously + // increase. This clips the control point bounds to prevent that from + // happening. + // NOTE: this will make the rendered animation behave slightly differently + // than the original. + interpolator = PathInterpolatorCompat.create( + Math.min(cp1.x, 1f), cp1.y, Math.max(cp2.x, 0f), cp2.y); + } else { + // We failed to create the interpolator. Fall back to linear. + interpolator = new LinearInterpolator(); + } + } try { putInterpolator(hash, new WeakReference<>(interpolator)); } catch (ArrayIndexOutOfBoundsException e) { |