From df1ffb950aa437aa1a8bd854bd63dceddbd4b212 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 6 Feb 2018 10:31:38 -0800
Subject: [PATCH] Fix bug where Cancel/Remove drop target text was not being
 updated.

Bug: 72644671
Change-Id: I8a042230b1a61b6ccd8a9c53bc09177f065351b0
---
 src/com/android/launcher3/ButtonDropTarget.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index a9cf8cca7f..19ee0b8505 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -344,9 +344,10 @@ public abstract class ButtonDropTarget extends TextView
     }
 
     public void setTextVisible(boolean isVisible) {
-        if (mTextVisible != isVisible) {
+        CharSequence newText = isVisible ? mText : "";
+        if (mTextVisible != isVisible || !TextUtils.equals(newText, getText())) {
             mTextVisible = isVisible;
-            setText(isVisible ? mText : "");
+            setText(newText);
             if (mTextVisible) {
                 setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null);
             } else {