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

Commit 92a015f2 authored by Winson Chung's avatar Winson Chung
Browse files

1/ Renaming some classes for clarity 

- SwipeAnimationTargetSet -> RecentsAnimationTargets
- RemoteAnimationTargetSet -> RemoteAnimationTargets
- RecentsAnimationListenerSet -> RecentsAnimationCallbacks
- SwipeAnimationTargetSet.SwipeAnimationListener -> RecentsAnimationCallbacks.RecentsAnimationListener
- ClipAnimationHelper -> AppWindowAnimationHelper
- AssistantTouchConsumer -> AssistantInputConsumer

Bug: 141886704

Change-Id: I78485a1651bb360ffbac2d0c462855931a995ee1
parent 023188e4

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

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.util.Log; 
import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.LauncherAnimationRunner;

import com.android.quickstep.util.RemoteAnimationProvider;

import com.android.quickstep.util.RemoteAnimationTargetSet;

import com.android.quickstep.util.RemoteAnimationTargets;

import com.android.quickstep.views.IconRecentsView;

import com.android.systemui.shared.system.ActivityOptionsCompat;

import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
@@ -113,8 +113,8 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
            return anim;

        }



        RemoteAnimationTargetSet targetSet =

                new RemoteAnimationTargetSet(appTargets, wallpaperTargets, MODE_CLOSING);

        RemoteAnimationTargets targetSet =

                new RemoteAnimationTargets(appTargets, wallpaperTargets, MODE_CLOSING);

        mRecentsView.setTransitionedFromApp(!targetSet.isAnimatingHome());



        RemoteAnimationTargetCompat recentsTarget = null;

go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.anim.AnimatorPlaybackController;

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

import com.android.quickstep.util.ActivityInitListener;

import com.android.quickstep.util.RemoteAnimationTargetSet;

import com.android.quickstep.util.RemoteAnimationTargets;

import com.android.quickstep.views.IconRecentsView;



import java.util.function.BiPredicate;
@@ -59,7 +59,7 @@ public final class FallbackActivityControllerHelper extends 
            boolean isAnimatingToRecents = false;



            @Override

            public void onRemoteAnimationReceived(RemoteAnimationTargetSet targets) {

            public void onRemoteAnimationReceived(RemoteAnimationTargets targets) {

                isAnimatingToRecents = targets != null && targets.isAnimatingHome();

                if (!isAnimatingToRecents) {

                    rv.setAlpha(1);

quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.anim.SpringAnimationBuilder;

import com.android.quickstep.util.ClipAnimationHelper;

import com.android.quickstep.util.AppWindowAnimationHelper;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -71,7 +71,7 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti 


        TaskView taskView = findTaskViewToLaunch(mLauncher, v, appTargets);



        ClipAnimationHelper helper = new ClipAnimationHelper(mLauncher);

        AppWindowAnimationHelper helper = new AppWindowAnimationHelper(mLauncher);

        anim.play(getRecentsWindowAnimator(taskView, skipLauncherChanges, appTargets,

                wallpaperTargets, helper).setDuration(RECENTS_LAUNCH_DURATION));

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class BackgroundAppState extends OverviewState { 
        } else {

            dummyTask = recentsView.getTaskViewAt(0);

        }

        return recentsView.getTempClipAnimationHelper().updateForFullscreenOverview(dummyTask)

        return recentsView.getTempAppWindowAnimationHelper().updateForFullscreenOverview(dummyTask)

                .getScaleAndTranslation();

    }

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

+6 −6
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ import android.view.View; 
import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.quickstep.util.ClipAnimationHelper;

import com.android.quickstep.util.AppWindowAnimationHelper;

import com.android.quickstep.util.RemoteAnimationProvider;

import com.android.quickstep.util.RemoteAnimationTargetSet;

import com.android.quickstep.util.RemoteAnimationTargets;

import com.android.quickstep.views.RecentsView;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
@@ -115,7 +115,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
            return anim;

        }



        RemoteAnimationTargetSet targetSet = new RemoteAnimationTargetSet(appTargets,

        RemoteAnimationTargets targetSet = new RemoteAnimationTargets(appTargets,

                wallpaperTargets, MODE_CLOSING);



        // Use the top closing app to determine the insets for the animation
@@ -126,7 +126,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
            return anim;

        }



        final ClipAnimationHelper clipHelper = new ClipAnimationHelper(mActivity);

        final AppWindowAnimationHelper clipHelper = new AppWindowAnimationHelper(mActivity);



        // At this point, the activity is already started and laid-out. Get the home-bounds

        // relative to the screen using the rootView of the activity.
@@ -142,7 +142,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
        clipHelper.updateTargetRect(targetRect);

        clipHelper.prepareAnimation(mActivity.getDeviceProfile(), false /* isOpening */);



        ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()

        AppWindowAnimationHelper.TransformParams params = new AppWindowAnimationHelper.TransformParams()

                .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplierCompat(rootView));

        ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1);

        valueAnimator.setDuration(RECENTS_LAUNCH_DURATION);
@@ -156,7 +156,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 


        if (targetSet.isAnimatingHome()) {

            // If we are animating home, fade in the opening targets

            RemoteAnimationTargetSet openingSet = new RemoteAnimationTargetSet(appTargets,

            RemoteAnimationTargets openingSet = new RemoteAnimationTargets(appTargets,

                    wallpaperTargets, MODE_OPENING);



            TransactionCompat transaction = new TransactionCompat();