|
@@ -45,10 +45,10 @@ class SharedElementAnimatorCreator {
|
45
|
45
|
if (shouldAddCurvedMotionAnimator(resolver, params.interpolation)) {
|
46
|
46
|
result.add(createCurvedMotionAnimator(resolver, params));
|
47
|
47
|
} else {
|
48
|
|
- if (shouldAddLinearMotionXAnimator(resolver, params)) {
|
|
48
|
+ if (shouldAddLinearMotionXAnimator(resolver)) {
|
49
|
49
|
result.add(createXAnimator(resolver, params));
|
50
|
50
|
}
|
51
|
|
- if (shouldAddLinearMotionYAnimator(resolver, params)) {
|
|
51
|
+ if (shouldAddLinearMotionYAnimator(resolver)) {
|
52
|
52
|
result.add(createYAnimator(resolver, params));
|
53
|
53
|
}
|
54
|
54
|
}
|
|
@@ -76,12 +76,12 @@ class SharedElementAnimatorCreator {
|
76
|
76
|
return resolver.startScaleX != resolver.endScaleX && !params.animateClipBounds;
|
77
|
77
|
}
|
78
|
78
|
|
79
|
|
- private boolean shouldAddLinearMotionXAnimator(AnimatorValuesResolver resolver, SharedElementTransitionParams params) {
|
80
|
|
- return params.animateClipBounds || resolver.dx != 0;
|
|
79
|
+ private boolean shouldAddLinearMotionXAnimator(AnimatorValuesResolver resolver) {
|
|
80
|
+ return resolver.dx != 0;
|
81
|
81
|
}
|
82
|
82
|
|
83
|
|
- private boolean shouldAddLinearMotionYAnimator(AnimatorValuesResolver resolver, SharedElementTransitionParams params) {
|
84
|
|
- return params.animateClipBounds || resolver.dy != 0;
|
|
83
|
+ private boolean shouldAddLinearMotionYAnimator(AnimatorValuesResolver resolver) {
|
|
84
|
+ return resolver.dy != 0;
|
85
|
85
|
}
|
86
|
86
|
|
87
|
87
|
private boolean shouldAddCurvedMotionAnimator(AnimatorValuesResolver resolver, InterpolationParams interpolation) {
|