Merge "Don't animate invisible views" into sc-dev am: bd78fd02de

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14427876 Change-Id: I6e31a282673b89e79d9dad68a547d068d39344fc
2021-05-05 18:39:27 +00:00
parent 27e11c00a4 bd78fd02de
commit ec5d34c9a4
1 changed files with 5 additions and 0 deletions
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -23553,6 +23553,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
            mStateListAnimator.setState(state);
        }

+        if (!isAggregatedVisible()) {
+            // If we're not visible, skip any animated changes
+            jumpDrawablesToCurrentState();
+        }
+
        if (changed) {
            invalidate();
        }