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

Commit 721d5c7c authored by Jon Miranda's avatar Jon Miranda Committed by Automerger Merge Worker
Browse files

Fix bug where double swipe gets us stuck in Hint state while in Overview. am: a8c08584 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12173854

Change-Id: I2d28a41aff760ce884d46ce2d0fc6f9b2da8152b
parents 3857d264 a8c08584

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java

+1 −0
Original line number Diff line number Diff line
@@ -1090,6 +1090,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte 
        anim.addAnimatorListener(new AnimationSuccessListener() {

            @Override

            public void onAnimationStart(Animator animation) {

                super.onAnimationStart(animation);

                if (mActivity != null) {

                    removeLiveTileOverlay();

                }

quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ public abstract class SwipeUpAnimationLogic { 


        @Override

        public void onAnimationStart(Animator animation) {

            super.onAnimationStart(animation);

            mHomeAnim.dispatchOnStart();

        }

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ public class TaskMenuView extends AbstractFloatingView { 
        mOpenCloseAnimator.addListener(new AnimationSuccessListener() {

            @Override

            public void onAnimationStart(Animator animation) {

                super.onAnimationStart(animation);

                setVisibility(VISIBLE);

            }

src/com/android/launcher3/anim/AlphaUpdateListener.java

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ public class AlphaUpdateListener extends AnimationSuccessListener 
    }



    @Override

    public void onAnimationStart(Animator arg0) {

    public void onAnimationStart(Animator animation) {

        super.onAnimationStart(animation);

        // We want the views to be visible for animation, so fade-in/out is visible

        mView.setVisibility(View.VISIBLE);

    }

src/com/android/launcher3/anim/AnimationSuccessListener.java

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.launcher3.anim; 
import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;



import androidx.annotation.CallSuper;



/**

 * Extension of {@link AnimatorListenerAdapter} for listening for non-cancelled animations

 */
@@ -26,6 +28,12 @@ public abstract class AnimationSuccessListener extends AnimatorListenerAdapter { 


    protected boolean mCancelled = false;



    @Override

    @CallSuper

    public void onAnimationStart(Animator animation) {

        mCancelled = false;

    }



    @Override

    public void onAnimationCancel(Animator animation) {

        mCancelled = true;