summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2021-05-05 18:19:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-05-05 18:19:40 +0000
commitbd78fd02deb239277adcedfe18227d9ec61e798a (patch)
treea727d3f904190a777a39282c1cea7ac514b36f39 /core/java
parent0c361a917dfb0110cc20f7f21bc5b1c9ed3fe4d6 (diff)
parent12bb4739d21c063eee64304d05cca9dfb93c8bea (diff)
Merge "Don't animate invisible views" into sc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/View.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 11fac0561907..c1c892c98653 100644
--- 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();
}