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

Commit f9df8f36 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where workspace alpha does not get set to 1 when animation gets... 

Merge "Fix bug where workspace alpha does not get set to 1 when animation gets cancelled." into sc-dev
parents 5ca92844 651abb99

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+0 −2
Original line number Diff line number Diff line
@@ -497,8 +497,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                    view -> viewsToAnimate.add(((CellLayout) view).getShortcutsAndWidgets()));



            viewsToAnimate.add(mLauncher.getHotseat());

            // Add QSB

            viewsToAnimate.add(mLauncher.findViewById(R.id.search_container_all_apps));



            viewsToAnimate.forEach(view -> {

                view.setLayerType(View.LAYER_TYPE_HARDWARE, null);

quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW; 
import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.view.View;
@@ -98,6 +99,14 @@ public class WorkspaceRevealAnim { 
        alpha.setDuration(DURATION_MS);

        alpha.setInterpolator(Interpolators.DECELERATED_EASE);

        mAnimators.play(alpha);



        mAnimators.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {

                SCALE_PROPERTY.set(v, 1f);

                v.setAlpha(1f);

            }

        });

    }



    /**