diff options
| author | Jon Miranda <jonmiranda@google.com> | 2019-04-15 13:01:05 -0700 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2019-04-15 13:28:26 -0700 |
| commit | 83cdca67ba880eaea8b18f3ef9b09dce75399f7b (patch) | |
| tree | 2b98632ad1e776e39a94a7a593b0e6b474206264 /src | |
| parent | d4eed0b191196b4ba4e43adc573f11f24aef12ff (diff) | |
| download | android_packages_apps_Trebuchet-83cdca67ba880eaea8b18f3ef9b09dce75399f7b.tar.gz android_packages_apps_Trebuchet-83cdca67ba880eaea8b18f3ef9b09dce75399f7b.tar.bz2 android_packages_apps_Trebuchet-83cdca67ba880eaea8b18f3ef9b09dce75399f7b.zip | |
Fix bug where BubbleTextView text fades in after long press.
Introduced by Ieeb5d7b8fb389a2f7ee263d38b3021ffdefefd93.
Change-Id: I45e180dda09f03297530e5b5575b71f60c03fb5f
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/views/FloatingIconView.java | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 4dd2e0a76..d75006e89 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -480,8 +480,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, */ public ObjectAnimator createTextAlphaAnimator(boolean fadeIn) { float toAlpha = shouldTextBeVisible() && fadeIn ? 1 : 0; - float fromAlpha = toAlpha == 1 ? 0 : 1f; - return ObjectAnimator.ofFloat(this, TEXT_ALPHA_PROPERTY, fromAlpha, toAlpha); + return ObjectAnimator.ofFloat(this, TEXT_ALPHA_PROPERTY, toAlpha); } @Override diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java index fab21fada..524c69f18 100644 --- a/src/com/android/launcher3/views/FloatingIconView.java +++ b/src/com/android/launcher3/views/FloatingIconView.java @@ -421,12 +421,6 @@ public class FloatingIconView extends View implements Animator.AnimatorListener, @Override public void onAnimationStart(Animator animation) { originalView.setVisibility(VISIBLE); - - if (originalView instanceof FolderIcon) { - FolderIcon folderIcon = (FolderIcon) originalView; - folderIcon.setBackgroundVisible(false); - folderIcon.getFolderName().setTextVisibility(false); - } } @Override @@ -441,6 +435,8 @@ public class FloatingIconView extends View implements Animator.AnimatorListener, if (originalView instanceof FolderIcon) { FolderIcon folderIcon = (FolderIcon) originalView; + folderIcon.setBackgroundVisible(false); + folderIcon.getFolderName().setTextVisibility(false); fade.play(folderIcon.getFolderName().createTextAlphaAnimator(true)); fade.addListener(new AnimatorListenerAdapter() { @Override |