commit 5bf936ac16886a0af5870bd6dcaf5ee9931d51e9
author Sebastian Franco <fransebas@google.com> Thu Dec 01 11:51:12 2022 -0800
committer Sebastian Franco <fransebas@google.com> Fri Dec 02 14:05:24 2022 -0800
tree 8c94ccb16f03546d39f61ba98fc59f81d7b473f9
parent c04120e61e3d7f391c0e2cc319e4887db4253957

Preventing the text on ButtonDropTarget.resizeTextToFit  size to go below 0

Bug: 260984829
Test: atest HomeScreenEditStateImageTest
Change-Id: I4aba76de512aedf5b4c921593fe43099700eb773

src/com/android/launcher3/ButtonDropTarget.java

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 5abe3d3..ee3e278 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -423,14 +423,15 @@
         float textSize = Utilities.pxToSp(getTextSize());
 
         int availableWidth = getMeasuredWidth();
-        while (textSize > minSize) {
-            if (isTextTruncated(availableWidth)) {
-                textSize -= step;
+        while (isTextTruncated(availableWidth)) {
+            textSize -= step;
+            if (textSize < minSize) {
+                textSize = minSize;
                 setTextSize(textSize);
-            } else {
-                return textSize;
+                break;
             }
+            setTextSize(textSize);
         }
-        return minSize;
+        return textSize;
     }
 }