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

Commit 38e87e80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Split LauncherAppTransitionManagerImpl for Go" into ub-launcher3-master

parents 886f1a11 c4ad03b9

go/quickstep/res/values/override.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Class overrides for Go version of launcher with Go recents. -->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="app_transition_manager_class" translatable="false">com.android.launcher3.GoLauncherAppTransitionManagerImpl</string>



  <string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>



  <string name="main_process_initializer_class" translatable="false">com.android.quickstep.QuickstepProcessInitializer</string>

</resources>

go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java

0 → 100644
+65 −0
Original line number Diff line number Diff line 
package com.android.launcher3;



import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.quickstep.views.IconRecentsView.CONTENT_ALPHA;



import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.app.ActivityOptions;

import android.content.Context;

import android.view.View;



import com.android.quickstep.views.IconRecentsView;

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



/**

 * A {@link QuickstepAppTransitionManagerImpl} with recents-specific app transitions based off

 * {@link com.android.quickstep.views.IconRecentsView}.

 */

public final class GoLauncherAppTransitionManagerImpl extends QuickstepAppTransitionManagerImpl {



    public GoLauncherAppTransitionManagerImpl(Context context) {

        super(context);

    }



    @Override

    protected boolean isLaunchingFromRecents(View v, RemoteAnimationTargetCompat[] targets) {

        return mLauncher.getStateManager().getState().overviewUi;

    }



    @Override

    protected boolean isQuickSwitchInProgress() {

        // Go does not support quick scrub.

        return false;

    }



    @Override

    protected ActivityOptions getQuickSwitchActivityOptions() {

        // Go does not support quick scrub.

        return null;

    }



    @Override

    protected void composeRecentsLaunchAnimator(AnimatorSet anim, View v,

            RemoteAnimationTargetCompat[] targets, boolean launcherClosing) {

        //TODO: Implement this based off IconRecentsView

    }



    @Override

    protected Runnable composeViewContentAnimator(AnimatorSet anim, float[] alphas, float[] trans) {

        IconRecentsView overview = mLauncher.getOverviewPanel();

        ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,

                CONTENT_ALPHA, alphas);

        alpha.setDuration(CONTENT_ALPHA_DURATION);

        alpha.setInterpolator(LINEAR);

        anim.play(alpha);



        ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);

        transY.setInterpolator(AGGRESSIVE_EASE);

        transY.setDuration(CONTENT_TRANSLATION_DURATION);

        anim.play(transY);



        return mLauncher.getStateManager()::reapplyState;

    }

}

quickstep/res/values/override.xml→quickstep/recents_ui_overrides/res/values/override.xml

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
     limitations under the License.

-->



<!-- Class overrides for launcher with quickstep. -->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="app_transition_manager_class" translatable="false">com.android.launcher3.LauncherAppTransitionManagerImpl</string>

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

0 → 100644
+148 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.launcher3;



import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.quickstep.TaskUtils.findTaskViewToLaunch;

import static com.android.quickstep.TaskUtils.getRecentsWindowAnimator;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.app.ActivityOptions;

import android.content.Context;

import android.view.View;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.Interpolators;

import com.android.quickstep.util.ClipAnimationHelper;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

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



/**

 * A {@link QuickstepAppTransitionManagerImpl} that also implements recents transitions from

 * {@link RecentsView}.

 */

public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransitionManagerImpl {



    private RecentsView mRecentsView;



    public LauncherAppTransitionManagerImpl(Context context) {

        super(context);

        mRecentsView = mLauncher.getOverviewPanel();

    }



    @Override

    protected boolean isLaunchingFromRecents(@NonNull View v,

            @Nullable RemoteAnimationTargetCompat[] targets) {

        return mLauncher.getStateManager().getState().overviewUi

                && findTaskViewToLaunch(mLauncher, v, targets) != null;

    }



    @Override

    protected boolean isQuickSwitchInProgress() {

        return mRecentsView.getQuickScrubController().isQuickSwitch();

    }



    @Override

    protected ActivityOptions getQuickSwitchActivityOptions() {

        return ActivityOptions.makeCustomAnimation(mLauncher, R.anim.no_anim,

                R.anim.no_anim);

    }



    @Override

    protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,

            @NonNull RemoteAnimationTargetCompat[] targets, boolean launcherClosing) {

        RecentsView recentsView = mLauncher.getOverviewPanel();

        boolean skipLauncherChanges = !launcherClosing;

        boolean isLaunchingFromQuickscrub =

                recentsView.getQuickScrubController().isWaitingForTaskLaunch();



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



        int duration = isLaunchingFromQuickscrub

                ? RECENTS_QUICKSCRUB_LAUNCH_DURATION

                : RECENTS_LAUNCH_DURATION;



        ClipAnimationHelper helper = new ClipAnimationHelper(mLauncher);

        anim.play(getRecentsWindowAnimator(taskView, skipLauncherChanges, targets, helper)

                .setDuration(duration));



        Animator childStateAnimation = null;

        // Found a visible recents task that matches the opening app, lets launch the app from there

        Animator launcherAnim;

        final AnimatorListenerAdapter windowAnimEndListener;

        if (launcherClosing) {

            launcherAnim = recentsView.createAdjacentPageAnimForTaskLaunch(taskView, helper);

            launcherAnim.setInterpolator(Interpolators.TOUCH_RESPONSE_INTERPOLATOR);

            launcherAnim.setDuration(duration);



            // Make sure recents gets fixed up by resetting task alphas and scales, etc.

            windowAnimEndListener = new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {

                    mLauncher.getStateManager().moveToRestState();

                    mLauncher.getStateManager().reapplyState();

                }

            };

        } else {

            AnimatorPlaybackController controller =

                    mLauncher.getStateManager().createAnimationToNewWorkspace(NORMAL, duration);

            controller.dispatchOnStart();

            childStateAnimation = controller.getTarget();

            launcherAnim = controller.getAnimationPlayer().setDuration(duration);

            windowAnimEndListener = new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {

                    mLauncher.getStateManager().goToState(NORMAL, false);

                }

            };

        }

        anim.play(launcherAnim);



        // Set the current animation first, before adding windowAnimEndListener. Setting current

        // animation adds some listeners which need to be called before windowAnimEndListener

        // (the ordering of listeners matter in this case).

        mLauncher.getStateManager().setCurrentAnimation(anim, childStateAnimation);

        anim.addListener(windowAnimEndListener);

    }



    @Override

    protected Runnable composeViewContentAnimator(@NonNull AnimatorSet anim, float[] alphas,

            float[] trans) {

        RecentsView overview = mLauncher.getOverviewPanel();

        ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,

                RecentsView.CONTENT_ALPHA, alphas);

        alpha.setDuration(CONTENT_ALPHA_DURATION);

        alpha.setInterpolator(LINEAR);

        anim.play(alpha);



        ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);

        transY.setInterpolator(AGGRESSIVE_EASE);

        transY.setDuration(CONTENT_TRANSLATION_DURATION);

        anim.play(transY);



        return mLauncher.getStateManager()::reapplyState;

    }

}

quickstep/src/com/android/launcher3/LauncherInitListener.java

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ public class LauncherInitListener extends InternalStateHandler implements Activi 
    @Override

    protected boolean init(Launcher launcher, boolean alreadyOnHome) {

        if (mRemoteAnimationProvider != null) {

            LauncherAppTransitionManagerImpl appTransitionManager =

                    (LauncherAppTransitionManagerImpl) launcher.getAppTransitionManager();

            QuickstepAppTransitionManagerImpl appTransitionManager =

                    (QuickstepAppTransitionManagerImpl) launcher.getAppTransitionManager();



            // Set a one-time animation provider. After the first call, this will get cleared.

            // TODO: Probably also check the intended target id.