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

Commit b6528c92 authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "Make settings/text alpha animation happen in parallelSet instead of... 

Merge "Make settings/text alpha animation happen in parallelSet instead of when headerSetter starts." into main
parents 7640b08e 1fe2da0d

src/com/android/launcher3/allapps/PrivateProfileManager.java

+7 −6
Original line number Diff line number Diff line
@@ -662,10 +662,7 @@ public class PrivateProfileManager extends UserProfileManager { 
            return;

        }

        attachFloatingMaskView(expand);

        PropertySetter headerSetter = new AnimatedPropertySetter();

        headerSetter.add(updateSettingsGearAlpha(expand));

        headerSetter.add(updateLockTextAlpha(expand));

        AnimatorSet animatorSet = headerSetter.buildAnim();

        AnimatorSet animatorSet = new AnimatedPropertySetter().buildAnim();

        animatorSet.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationStart(Animator animation) {
@@ -710,12 +707,16 @@ public class PrivateProfileManager extends UserProfileManager { 
            }

        }));

        if (expand) {

            animatorSet.playTogether(animateAlphaOfIcons(true),

            animatorSet.playTogether(updateSettingsGearAlpha(true),

                    updateLockTextAlpha(true),

                    animateAlphaOfIcons(true),

                    animatePillTransition(true),

                    translateFloatingMaskView(false));

        } else {

            AnimatorSet parallelSet = new AnimatorSet();

            parallelSet.playTogether(animateAlphaOfIcons(false),

            parallelSet.playTogether(updateSettingsGearAlpha(false),

                    updateLockTextAlpha(false),

                    animateAlphaOfIcons(false),

                    animatePillTransition(false));

            if (isPrivateSpaceHidden()) {

                animatorSet.playSequentially(parallelSet,