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

Commit 80605f98 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix bug where double swipe gets us stuck in Hint state while in... 

Merge "Revert "Fix bug where double swipe gets us stuck in Hint state while in Overview."" into ub-launcher3-rvc-qpr-dev am: a2f9ea52

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

Change-Id: Id1065385e4d16ee38cfce2db4b57bddc5c3ef229
parents e338409f a2f9ea52

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

+0 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ 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

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



    @Override

    public void onAnimationStart(Animator animation) {

        super.onAnimationStart(animation);

    public void onAnimationStart(Animator arg0) {

        // 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

+0 −8
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 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

 */
@@ -28,12 +26,6 @@ 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;