From 12bb4739d21c063eee64304d05cca9dfb93c8bea Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 4 May 2021 13:53:01 -0400
Subject: [PATCH] Don't animate invisible views

Bug: 184230269
Test: wasn't
Change-Id: Iec6eefedc2c82750ea721ae3d1184be1939066ef
---
 core/java/android/view/View.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 11fac05619078..c1c892c986532 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();
         }