summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2018-02-06 10:31:38 -0800
committerJon Miranda <jonmiranda@google.com>2018-02-06 10:38:26 -0800
commitdf1ffb950aa437aa1a8bd854bd63dceddbd4b212 (patch)
tree58358cc72c78dafed23e5f20f6e8d6df1eaf3fb9 /src
parent2eb7f0a34bb201eb229f179579c430ebbe874f6e (diff)
downloadandroid_packages_apps_Trebuchet-df1ffb950aa437aa1a8bd854bd63dceddbd4b212.tar.gz
android_packages_apps_Trebuchet-df1ffb950aa437aa1a8bd854bd63dceddbd4b212.tar.bz2
android_packages_apps_Trebuchet-df1ffb950aa437aa1a8bd854bd63dceddbd4b212.zip
Fix bug where Cancel/Remove drop target text was not being updated.
Bug: 72644671 Change-Id: I8a042230b1a61b6ccd8a9c53bc09177f065351b0
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/ButtonDropTarget.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index a9cf8cca7..19ee0b850 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 {