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

Commit 651abb99 authored by Jon Miranda's avatar Jon Miranda
Browse files

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

- Can also remove QSB from app launch animator, since its in the hotseat now.

Bug: 189458349
Test: manual
Change-Id: Ib41376e3f8c58166c6ee6fbfed38bdd443663df4
parent b8ad5cb6

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);

            }

        });

    }



    /**