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

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

Merge "Split TaskUtils for Go recents" into ub-launcher3-master

parents 4dcb34fb 295954ba

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

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 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 static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;

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



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static com.android.launcher3.QuickstepAppTransitionManagerImpl 
        .STATUS_BAR_TRANSITION_DURATION;

import static com.android.launcher3.QuickstepAppTransitionManagerImpl

        .STATUS_BAR_TRANSITION_PRE_DELAY;

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

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

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

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

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

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

 * Copyright (C) 2019 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.quickstep;



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

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

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



import android.animation.ValueAnimator;

import android.content.ComponentName;

import android.graphics.RectF;

import android.view.View;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.Utilities;

import com.android.quickstep.util.ClipAnimationHelper;

import com.android.quickstep.util.MultiValueUpdateListener;

import com.android.quickstep.util.RemoteAnimationTargetSet;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.Task;

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

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



/**

 * Utility class for helpful methods related to {@link TaskView} objects and their tasks.

 */

public final class TaskViewUtils {



    private TaskViewUtils() {}



    /**

     * Try to find a TaskView that corresponds with the component of the launched view.

     *

     * If this method returns a non-null TaskView, it will be used in composeRecentsLaunchAnimation.

     * Otherwise, we will assume we are using a normal app transition, but it's possible that the

     * opening remote target (which we don't get until onAnimationStart) will resolve to a TaskView.

     */

    public static TaskView findTaskViewToLaunch(

            BaseDraggingActivity activity, View v, RemoteAnimationTargetCompat[] targets) {

        RecentsView recentsView = activity.getOverviewPanel();

        if (v instanceof TaskView) {

            TaskView taskView = (TaskView) v;

            return recentsView.isTaskViewVisible(taskView) ? taskView : null;

        }



        // It's possible that the launched view can still be resolved to a visible task view, check

        // the task id of the opening task and see if we can find a match.

        if (v.getTag() instanceof ItemInfo) {

            ItemInfo itemInfo = (ItemInfo) v.getTag();

            ComponentName componentName = itemInfo.getTargetComponent();

            int userId = itemInfo.user.getIdentifier();

            if (componentName != null) {

                for (int i = 0; i < recentsView.getTaskViewCount(); i++) {

                    TaskView taskView = recentsView.getTaskViewAt(i);

                    if (recentsView.isTaskViewVisible(taskView)) {

                        Task.TaskKey key = taskView.getTask().key;

                        if (componentName.equals(key.getComponent()) && userId == key.userId) {

                            return taskView;

                        }

                    }

                }

            }

        }



        if (targets == null) {

            return null;

        }

        // Resolve the opening task id

        int openingTaskId = -1;

        for (RemoteAnimationTargetCompat target : targets) {

            if (target.mode == MODE_OPENING) {

                openingTaskId = target.taskId;

                break;

            }

        }



        // If there is no opening task id, fall back to the normal app icon launch animation

        if (openingTaskId == -1) {

            return null;

        }



        // If the opening task id is not currently visible in overview, then fall back to normal app

        // icon launch animation

        TaskView taskView = recentsView.getTaskView(openingTaskId);

        if (taskView == null || !recentsView.isTaskViewVisible(taskView)) {

            return null;

        }

        return taskView;

    }



    /**

     * @return Animator that controls the window of the opening targets for the recents launch

     * animation.

     */

    public static ValueAnimator getRecentsWindowAnimator(TaskView v, boolean skipViewChanges,

            RemoteAnimationTargetCompat[] targets, final ClipAnimationHelper inOutHelper) {

        ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()

                .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplierCompat(v));



        final ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);

        appAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

        appAnimator.addUpdateListener(new MultiValueUpdateListener() {



            // Defer fading out the view until after the app window gets faded in

            final FloatProp mViewAlpha = new FloatProp(1f, 0f, 75, 75, LINEAR);

            final FloatProp mTaskAlpha = new FloatProp(0f, 1f, 0, 75, LINEAR);



            final RemoteAnimationTargetSet mTargetSet;



            final RectF mThumbnailRect;



            {

                mTargetSet = new RemoteAnimationTargetSet(targets, MODE_OPENING);

                inOutHelper.setTaskAlphaCallback((t, alpha) -> mTaskAlpha.value);



                inOutHelper.prepareAnimation(true /* isOpening */);

                inOutHelper.fromTaskThumbnailView(v.getThumbnail(), (RecentsView) v.getParent(),

                        mTargetSet.apps.length == 0 ? null : mTargetSet.apps[0]);



                mThumbnailRect = new RectF(inOutHelper.getTargetRect());

                mThumbnailRect.offset(-v.getTranslationX(), -v.getTranslationY());

                Utilities.scaleRectFAboutCenter(mThumbnailRect, 1 / v.getScaleX());

            }



            @Override

            public void onUpdate(float percent) {

                params.setProgress(1 - percent);

                RectF taskBounds = inOutHelper.applyTransform(mTargetSet, params);

                if (!skipViewChanges) {

                    float scale = taskBounds.width() / mThumbnailRect.width();

                    v.setScaleX(scale);

                    v.setScaleY(scale);

                    v.setTranslationX(taskBounds.centerX() - mThumbnailRect.centerX());

                    v.setTranslationY(taskBounds.centerY() - mThumbnailRect.centerY());

                    v.setAlpha(mViewAlpha.value);

                }

            }

        });

        return appAnimator;

    }

}

quickstep/src/com/android/quickstep/TaskUtils.java

+3 −128
Original line number Diff line number Diff line
@@ -16,44 +16,30 @@ 


package com.android.quickstep;



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

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

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



import android.animation.ValueAnimator;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.graphics.RectF;

import android.os.UserHandle;

import android.util.Log;

import android.view.View;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.Utilities;

import com.android.launcher3.compat.LauncherAppsCompat;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.util.ComponentKey;

import com.android.quickstep.util.ClipAnimationHelper;

import com.android.quickstep.util.MultiValueUpdateListener;

import com.android.quickstep.util.RemoteAnimationTargetSet;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.Task;

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

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



import java.util.List;



/**

 * Contains helpful methods for retrieving data from {@link Task}s.

 */

public class TaskUtils {

public final class TaskUtils {



    private static final String TAG = "TaskUtils";



    private TaskUtils() {}



    /**

     * TODO: remove this once we switch to getting the icon and label from IconCache.

     */
@@ -79,117 +65,6 @@ public class TaskUtils { 
    }





    /**

     * Try to find a TaskView that corresponds with the component of the launched view.

     *

     * If this method returns a non-null TaskView, it will be used in composeRecentsLaunchAnimation.

     * Otherwise, we will assume we are using a normal app transition, but it's possible that the

     * opening remote target (which we don't get until onAnimationStart) will resolve to a TaskView.

     */

    public static TaskView findTaskViewToLaunch(

            BaseDraggingActivity activity, View v, RemoteAnimationTargetCompat[] targets) {

        RecentsView recentsView = activity.getOverviewPanel();

        if (v instanceof TaskView) {

            TaskView taskView = (TaskView) v;

            return recentsView.isTaskViewVisible(taskView) ? taskView : null;

        }



        // It's possible that the launched view can still be resolved to a visible task view, check

        // the task id of the opening task and see if we can find a match.

        if (v.getTag() instanceof ItemInfo) {

            ItemInfo itemInfo = (ItemInfo) v.getTag();

            ComponentName componentName = itemInfo.getTargetComponent();

            int userId = itemInfo.user.getIdentifier();

            if (componentName != null) {

                for (int i = 0; i < recentsView.getTaskViewCount(); i++) {

                    TaskView taskView = recentsView.getTaskViewAt(i);

                    if (recentsView.isTaskViewVisible(taskView)) {

                        Task.TaskKey key = taskView.getTask().key;

                        if (componentName.equals(key.getComponent()) && userId == key.userId) {

                            return taskView;

                        }

                    }

                }

            }

        }



        if (targets == null) {

            return null;

        }

        // Resolve the opening task id

        int openingTaskId = -1;

        for (RemoteAnimationTargetCompat target : targets) {

            if (target.mode == MODE_OPENING) {

                openingTaskId = target.taskId;

                break;

            }

        }



        // If there is no opening task id, fall back to the normal app icon launch animation

        if (openingTaskId == -1) {

            return null;

        }



        // If the opening task id is not currently visible in overview, then fall back to normal app

        // icon launch animation

        TaskView taskView = recentsView.getTaskView(openingTaskId);

        if (taskView == null || !recentsView.isTaskViewVisible(taskView)) {

            return null;

        }

        return taskView;

    }



    /**

     * @return Animator that controls the window of the opening targets for the recents launch

     * animation.

     */

    public static ValueAnimator getRecentsWindowAnimator(TaskView v, boolean skipViewChanges,

            RemoteAnimationTargetCompat[] targets, final ClipAnimationHelper inOutHelper) {

        ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()

                .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplierCompat(v));

        

        final ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);

        appAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

        appAnimator.addUpdateListener(new MultiValueUpdateListener() {



            // Defer fading out the view until after the app window gets faded in

            final FloatProp mViewAlpha = new FloatProp(1f, 0f, 75, 75, LINEAR);

            final FloatProp mTaskAlpha = new FloatProp(0f, 1f, 0, 75, LINEAR);



            final RemoteAnimationTargetSet mTargetSet;



            final RectF mThumbnailRect;



            {

                mTargetSet = new RemoteAnimationTargetSet(targets, MODE_OPENING);

                inOutHelper.setTaskAlphaCallback((t, alpha) -> mTaskAlpha.value);



                inOutHelper.prepareAnimation(true /* isOpening */);

                inOutHelper.fromTaskThumbnailView(v.getThumbnail(), (RecentsView) v.getParent(),

                        mTargetSet.apps.length == 0 ? null : mTargetSet.apps[0]);



                mThumbnailRect = new RectF(inOutHelper.getTargetRect());

                mThumbnailRect.offset(-v.getTranslationX(), -v.getTranslationY());

                Utilities.scaleRectFAboutCenter(mThumbnailRect, 1 / v.getScaleX());

            }



            @Override

            public void onUpdate(float percent) {

                params.setProgress(1 - percent);

                RectF taskBounds = inOutHelper.applyTransform(mTargetSet, params);

                if (!skipViewChanges) {

                    float scale = taskBounds.width() / mThumbnailRect.width();

                    v.setScaleX(scale);

                    v.setScaleY(scale);

                    v.setTranslationX(taskBounds.centerX() - mThumbnailRect.centerX());

                    v.setTranslationY(taskBounds.centerY() - mThumbnailRect.centerY());

                    v.setAlpha(mViewAlpha.value);

                }

            }

        });

        return appAnimator;

    }



    public static boolean taskIsATargetWithMode(RemoteAnimationTargetCompat[] targets,

            int taskId, int mode) {

        for (RemoteAnimationTargetCompat target : targets) {