commit 9acabb819928e89b17a3b024d507c55052ac7788
author Jonathan Miranda <jonmiranda@google.com> Mon Jan 25 18:30:55 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 25 18:30:55 2021 +0000
tree f28c64c17822b7994a448038f351b648d2a46d1a
parent e631b759f9e4bbd7445e6b29cf97a2a5f675da78
parent 8f09aa3438a5b5b8e1d14f88025215af748b4a91

Merge "Fix IllegalArgumentException for Float.NaN in ClipIconView."

src/com/android/launcher3/views/ClipIconView.java

diff --git a/src/com/android/launcher3/views/ClipIconView.java b/src/com/android/launcher3/views/ClipIconView.java
index fab0bd4..4e82336 100644
--- a/src/com/android/launcher3/views/ClipIconView.java
+++ b/src/com/android/launcher3/views/ClipIconView.java
@@ -161,6 +161,11 @@
         float scaleY = rect.height() / minSize;
         float scale = Math.max(1f, Math.min(scaleX, scaleY));
 
+        if (Float.isNaN(scale)) {
+            // Views are no longer laid out, do not update.
+            return;
+        }
+
         update(rect, progress, shapeProgressStart, cornerRadius, isOpening, scale,
                 minSize, lp, isVerticalBarLayout, dp);