commit df1ffb950aa437aa1a8bd854bd63dceddbd4b212
author Jon Miranda <jonmiranda@google.com> Tue Feb 06 10:31:38 2018 -0800
committer Jon Miranda <jonmiranda@google.com> Tue Feb 06 10:38:26 2018 -0800
tree 58358cc72c78dafed23e5f20f6e8d6df1eaf3fb9
parent 2eb7f0a34bb201eb229f179579c430ebbe874f6e

Fix bug where Cancel/Remove drop target text was not being updated.

Bug: 72644671
Change-Id: I8a042230b1a61b6ccd8a9c53bc09177f065351b0

src/com/android/launcher3/ButtonDropTarget.java

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index a9cf8cc..19ee0b8 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -344,9 +344,10 @@
     }
 
     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 {