Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83cdca67 authored by Jon Miranda's avatar Jon Miranda
Browse files

Fix bug where BubbleTextView text fades in after long press. 

Introduced by Ieeb5d7b8fb389a2f7ee263d38b3021ffdefefd93.

Change-Id: I45e180dda09f03297530e5b5575b71f60c03fb5f
parent d4eed0b1

src/com/android/launcher3/BubbleTextView.java

+1 −2
Original line number Diff line number Diff line
@@ -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

src/com/android/launcher3/views/FloatingIconView.java

+2 −6
Original line number Diff line number Diff line
@@ -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