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

Commit b0d868f7 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Preventing zoom-in animation from running everytime the app updates."... 

Merge "Preventing zoom-in animation from running everytime the app updates." into ub-launcher3-burnaby
parents 6579e1ee 3fcab663

src/com/android/launcher3/PreloadIconDrawable.java

+4 −0
Original line number Diff line number Diff line
@@ -213,6 +213,10 @@ class PreloadIconDrawable extends Drawable { 
        return mAnimationProgress;

    }



    public boolean hasNotCompleted() {

        return mAnimationProgress < ANIMATION_PROGRESS_COMPLETED;

    }



    @Override

    public int getIntrinsicHeight() {

        return mIcon.getIntrinsicHeight();

src/com/android/launcher3/Workspace.java

+3 −2
Original line number Diff line number Diff line
@@ -4334,8 +4334,9 @@ public class Workspace extends PagedView 
                        updates.contains(info)) {

                    ShortcutInfo si = (ShortcutInfo) info;

                    BubbleTextView shortcut = (BubbleTextView) v;

                    boolean oldPromiseState = getTextViewIcon(shortcut)

                            instanceof PreloadIconDrawable;

                    Drawable oldIcon = getTextViewIcon(shortcut);

                    boolean oldPromiseState = (oldIcon instanceof PreloadIconDrawable)

                            && ((PreloadIconDrawable) oldIcon).hasNotCompleted();

                    shortcut.applyFromShortcutInfo(si, mIconCache,

                            si.isPromise() != oldPromiseState);