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

Commit dd9d1ea1 authored by Winson Chung's avatar Winson Chung
Browse files

12/ Clean up some ActivityInterface calls 



- Require users of the activity interface to go through the interface to
  get the raw activity
- Remove calls that pass in the activity since the interface already can
  get the reference to it internally (and the interface always has the
  reference before the caller)

Bug: 141886704

Change-Id: I13e52caba593db918e8a7764c751044142fe7ece
Signed-off-by: default avatarWinson Chung <winsonc@google.com>
parent 981ef3a8

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

+6 −6
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
        RemoteAnimationProvider {

    private static final String TAG = "AppToOverviewAnimationProvider";



    private final BaseActivityInterface<T> mHelper;

    private final BaseActivityInterface<T> mActivityInterface;

    private final int mTargetTaskId;

    private IconRecentsView mRecentsView;

    private AppToOverviewAnimationListener mAnimationReadyListener;



    AppToOverviewAnimationProvider(BaseActivityInterface<T> helper, int targetTaskId) {

        mHelper = helper;

    AppToOverviewAnimationProvider(BaseActivityInterface<T> activityInterface, int targetTaskId) {

        mActivityInterface = activityInterface;

        mTargetTaskId = targetTaskId;

    }
@@ -68,15 +68,15 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
    /**

     * Callback for when the activity is ready/initialized.

     *

     * @param activity the activity that is ready

     * @param wasVisible true if it was visible before

     */

    boolean onActivityReady(T activity, Boolean wasVisible) {

    boolean onActivityReady(Boolean wasVisible) {

        T activity = mActivityInterface.getCreatedActivity();

        if (mAnimationReadyListener != null) {

            mAnimationReadyListener.onActivityReady(activity);

        }

        BaseActivityInterface.AnimationFactory factory =

                mHelper.prepareRecentsUI(activity, wasVisible,

                mActivityInterface.prepareRecentsUI(wasVisible,

                        false /* animate activity */, (controller) -> {

                            controller.dispatchOnStart();

                            ValueAnimator anim = controller.getAnimationPlayer()

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

+7 −5
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import com.android.launcher3.userevent.nano.LauncherLogProto; 
import com.android.quickstep.util.ActivityInitListener;

import com.android.quickstep.views.IconRecentsView;



import java.util.function.BiPredicate;

import java.util.function.Consumer;

import java.util.function.Predicate;



/**

 * {@link BaseActivityInterface} for recents when the default launcher is different than the
@@ -43,12 +43,13 @@ public final class FallbackActivityInterface extends 
    public FallbackActivityInterface() { }



    @Override

    public AnimationFactory prepareRecentsUI(RecentsActivity activity, boolean activityVisible,

    public AnimationFactory prepareRecentsUI(boolean activityVisible,

            boolean animateActivity, Consumer<AnimatorPlaybackController> callback) {

        if (activityVisible) {

            return (transitionLength) -> { };

        }



        RecentsActivity activity = getCreatedActivity();

        IconRecentsView rv = activity.getOverviewPanel();

        rv.setUsingRemoteAnimation(true);

        rv.setAlpha(0);
@@ -84,8 +85,9 @@ public final class FallbackActivityInterface extends 


    @Override

    public ActivityInitListener createActivityInitListener(

            BiPredicate<RecentsActivity, Boolean> onInitListener) {

        return new ActivityInitListener(onInitListener, RecentsActivity.ACTIVITY_TRACKER);

            Predicate<Boolean> onInitListener) {

        return new ActivityInitListener<>((activity, alreadyOnHome) ->

                onInitListener.test(alreadyOnHome), RecentsActivity.ACTIVITY_TRACKER);

    }



    @Nullable
@@ -115,5 +117,5 @@ public final class FallbackActivityInterface extends 
    }



    @Override

    public void onLaunchTaskSuccess(RecentsActivity activity) { }

    public void onLaunchTaskSuccess() { }

}

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

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ public abstract class GoActivityInterface<T extends BaseDraggingActivity> implem 
        BaseActivityInterface<T> {



    @Override

    public void onTransitionCancelled(T activity, boolean activityVisible) {

    public void onTransitionCancelled(boolean activityVisible) {

        // Go transitions to overview are all atomic.

    }
@@ -29,7 +29,7 @@ public abstract class GoActivityInterface<T extends BaseDraggingActivity> implem 
    }



    @Override

    public void onSwipeUpToRecentsComplete(T activity) {

    public void onSwipeUpToRecentsComplete() {

        // Go does not support swipe up gesture.

    }
@@ -39,7 +39,7 @@ public abstract class GoActivityInterface<T extends BaseDraggingActivity> implem 
    }



    @Override

    public HomeAnimationFactory prepareHomeUI(T activity) {

    public HomeAnimationFactory prepareHomeUI() {

        // Go does not support gestures from app to home.

        return null;

    }
@@ -63,7 +63,7 @@ public abstract class GoActivityInterface<T extends BaseDraggingActivity> implem 
    }



    @Override

    public void onLaunchTaskFailed(T activity) {

    public void onLaunchTaskFailed() {

        // Go does not support gestures from one task to another.

    }

}

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

+11 −10
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import com.android.launcher3.anim.AnimatorPlaybackController; 
import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.quickstep.views.IconRecentsView;



import java.util.function.BiPredicate;

import java.util.function.Consumer;

import java.util.function.Predicate;



/**

 * {@link BaseActivityInterface} for the in-launcher recents.
@@ -36,15 +36,15 @@ import java.util.function.Consumer; 
public final class LauncherActivityInterface extends GoActivityInterface<Launcher> {



    @Override

    public AnimationFactory prepareRecentsUI(Launcher activity,

            boolean activityVisible, boolean animateActivity,

    public AnimationFactory prepareRecentsUI(boolean activityVisible, boolean animateActivity,

            Consumer<AnimatorPlaybackController> callback) {

        LauncherState fromState = activity.getStateManager().getState();

        activity.<IconRecentsView>getOverviewPanel().setUsingRemoteAnimation(true);

        Launcher launcher = getCreatedActivity();

        LauncherState fromState = launcher.getStateManager().getState();

        launcher.<IconRecentsView>getOverviewPanel().setUsingRemoteAnimation(true);

        //TODO: Implement this based off where the recents view needs to be for app => recents anim.

        return new AnimationFactory() {

            public void createActivityInterface(long transitionLength) {

                callback.accept(activity.getStateManager().createAnimationToNewWorkspace(

                callback.accept(launcher.getStateManager().createAnimationToNewWorkspace(

                        fromState, OVERVIEW, transitionLength));

            }
@@ -54,9 +54,9 @@ public final class LauncherActivityInterface extends GoActivityInterface<Launche 
    }



    @Override

    public LauncherInitListener createActivityInitListener(

            BiPredicate<Launcher, Boolean> onInitListener) {

        return new LauncherInitListener(onInitListener);

    public LauncherInitListener createActivityInitListener(Predicate<Boolean> onInitListener) {

        return new LauncherInitListener((activity, alreadyOnHome) ->

                onInitListener.test(alreadyOnHome));

    }



    @Override
@@ -105,7 +105,8 @@ public final class LauncherActivityInterface extends GoActivityInterface<Launche 
    }



    @Override

    public void onLaunchTaskSuccess(Launcher launcher) {

    public void onLaunchTaskSuccess() {

        Launcher launcher = getCreatedActivity();

        launcher.getStateManager().moveToRestState();

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
        activity.<RecentsView>getOverviewPanel().showCurrentTask(mTargetTaskId);

        AbstractFloatingView.closeAllOpenViews(activity, wasVisible);

        BaseActivityInterface.AnimationFactory factory =

                mHelper.prepareRecentsUI(activity, wasVisible,

                mHelper.prepareRecentsUI(wasVisible,

                false /* animate activity */, (controller) -> {

                    controller.dispatchOnStart();

                    ValueAnimator anim = controller.getAnimationPlayer()
@@ -102,7 +102,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
        anim.addListener(new AnimationSuccessListener() {

            @Override

            public void onAnimationSuccess(Animator animator) {

                mHelper.onSwipeUpToRecentsComplete(mActivity);

                mHelper.onSwipeUpToRecentsComplete();

                if (mRecentsView != null) {

                    mRecentsView.animateUpRunningTaskIconScale();

                }