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

Commit 0638249b authored by Tony Wickham's avatar Tony Wickham
Browse files

Allow scroll to clear all in 3 button+fallback mode 

We weren't calling onSwipeUpToRecentsComplete(), which meant we kept the
disallowScrollToClearAll from prepareRecentsUi indefinitely.

Also don't update the icon scale if it is supposed to be scaled down, to
avoid it from scaling up and overlapping with the app window.

Fixes: 141184247
Change-Id: I49406764373e7121e289da7477dcbb58d0b98fd5
parent b1ccbd9d

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

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
        anim.addListener(new AnimationSuccessListener() {

            @Override

            public void onAnimationSuccess(Animator animator) {

                mHelper.onSwipeUpToRecentsComplete(mActivity);

                if (mRecentsView != null) {

                    mRecentsView.animateUpRunningTaskIconScale();

                }

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

+4 −0
Original line number Diff line number Diff line
@@ -941,6 +941,10 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        }

    }



    public boolean isTaskIconScaledDown(TaskView taskView) {

        return mRunningTaskIconScaledDown && getRunningTaskView() == taskView;

    }



    private void applyRunningTaskIconScale() {

        TaskView firstTask = getRunningTaskView();

        if (firstTask != null) {

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

+5 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.ObjectAnimator;

import android.animation.TimeInterpolator;

import android.animation.ValueAnimator;

import android.animation.ValueAnimator.AnimatorUpdateListener;

import android.app.ActivityOptions;

import android.content.Context;

import android.content.res.Resources;
@@ -54,7 +53,6 @@ import com.android.launcher3.Utilities; 
import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.logging.UserEventDispatcher;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
@@ -818,8 +816,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
                    / (getWidth() + currentInsetsLeft + currentInsetsRight));

        }



        // Some of the items in here are dependent on the current fullscreen params

        if (!getRecentsView().isTaskIconScaledDown(this)) {

            // Some of the items in here are dependent on the current fullscreen params, but don't

            // update them if the icon is supposed to be scaled down.

            setIconScaleAndDim(progress, true /* invert */);

        }



        thumbnail.setFullscreenParams(mCurrentFullscreenParams);

        mOutlineProvider.setFullscreenParams(mCurrentFullscreenParams);