From 5bf936ac16886a0af5870bd6dcaf5ee9931d51e9 Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Thu, 1 Dec 2022 11:51:12 -0800 Subject: [PATCH] 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 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 5abe3d3af6..ee3e278b8d 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -423,14 +423,15 @@ public abstract class ButtonDropTarget extends TextView 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; } }