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

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

Merge "Deprecated unused TRANSIT_DOCK_TASK_FROM_RECENTS transition."

parents f4c81035 823b3091

core/java/android/view/WindowManager.java

+0 −7
Original line number Diff line number Diff line
@@ -223,12 +223,6 @@ public interface WindowManager extends ViewManager { 
     */

    int TRANSIT_ACTIVITY_RELAUNCH = 18;



    /**

     * A task is being docked from recents.

     * @hide

     */

    int TRANSIT_DOCK_TASK_FROM_RECENTS = 19;



    /**

     * Keyguard is going away.

     * @hide
@@ -302,7 +296,6 @@ public interface WindowManager extends ViewManager { 
            TRANSIT_WALLPAPER_INTRA_CLOSE,

            TRANSIT_TASK_OPEN_BEHIND,

            TRANSIT_ACTIVITY_RELAUNCH,

            TRANSIT_DOCK_TASK_FROM_RECENTS,

            TRANSIT_KEYGUARD_GOING_AWAY,

            TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER,

            TRANSIT_KEYGUARD_OCCLUDE,

core/proto/android/view/enums.proto

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ enum TransitionTypeEnum { 
    TRANSIT_TASK_OPEN_BEHIND = 16;

    TRANSIT_TASK_IN_PLACE = 17;

    TRANSIT_ACTIVITY_RELAUNCH = 18;

    TRANSIT_DOCK_TASK_FROM_RECENTS = 19;

    TRANSIT_DOCK_TASK_FROM_RECENTS = 19 [deprecated=true];

    TRANSIT_KEYGUARD_GOING_AWAY = 20;

    TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER = 21;

    TRANSIT_KEYGUARD_OCCLUDE = 22;

packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java

+0 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ public class WindowManagerWrapper { 
            WindowManager.TRANSIT_WALLPAPER_INTRA_CLOSE;

    public static final int TRANSIT_TASK_OPEN_BEHIND = WindowManager.TRANSIT_TASK_OPEN_BEHIND;

    public static final int TRANSIT_ACTIVITY_RELAUNCH = WindowManager.TRANSIT_ACTIVITY_RELAUNCH;

    public static final int TRANSIT_DOCK_TASK_FROM_RECENTS =

            WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;

    public static final int TRANSIT_KEYGUARD_GOING_AWAY = WindowManager.TRANSIT_KEYGUARD_GOING_AWAY;

    public static final int TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER =

            WindowManager.TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER;

services/core/java/com/android/server/wm/AppTransition.java

+5 −48
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE; 
import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN;

import static android.view.WindowManager.TRANSIT_ACTIVITY_RELAUNCH;

import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE;

import static android.view.WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE;
@@ -92,7 +91,6 @@ import android.content.res.TypedArray; 
import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Path;

import android.graphics.Picture;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;
@@ -134,7 +132,6 @@ import com.android.internal.util.function.pooled.PooledPredicate; 
import com.android.server.AttributeCache;

import com.android.server.wm.animation.ClipRectLRAnimation;

import com.android.server.wm.animation.ClipRectTBAnimation;

import com.android.server.wm.animation.CurvedTranslateAnimation;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -161,9 +158,6 @@ public class AppTransition implements Dump { 
    static final Interpolator TOUCH_RESPONSE_INTERPOLATOR =

            new PathInterpolator(0.3f, 0f, 0.1f, 1f);



    private static final Interpolator THUMBNAIL_DOCK_INTERPOLATOR =

            new PathInterpolator(0.85f, 0f, 1f, 1f);



    /**

     * Maximum duration for the clip reveal animation. This is used when there is a lot of movement

     * involved, to make it more understandable.
@@ -1127,11 +1121,8 @@ public class AppTransition implements Dump { 
            scale.setInterpolator(interpolator);

            scale.setDuration(duration);

            Animation alpha = new AlphaAnimation(1f, 0f);

            alpha.setInterpolator(mNextAppTransition == TRANSIT_DOCK_TASK_FROM_RECENTS

                    ? THUMBNAIL_DOCK_INTERPOLATOR : mThumbnailFadeOutInterpolator);

            alpha.setDuration(mNextAppTransition == TRANSIT_DOCK_TASK_FROM_RECENTS

                    ? duration / 2

                    : duration);

            alpha.setInterpolator(mThumbnailFadeOutInterpolator);

            alpha.setDuration(duration);

            Animation translate = createCurvedMotion(fromX, toX, fromY, toY);

            translate.setInterpolator(interpolator);

            translate.setDuration(duration);
@@ -1194,45 +1185,16 @@ public class AppTransition implements Dump { 
    }



    private Animation createCurvedMotion(float fromX, float toX, float fromY, float toY) {



        // Almost no x-change - use linear animation

        if (Math.abs(toX - fromX) < 1f || mNextAppTransition != TRANSIT_DOCK_TASK_FROM_RECENTS) {

        return new TranslateAnimation(fromX, toX, fromY, toY);

        } else {

            final Path path = createCurvedPath(fromX, toX, fromY, toY);

            return new CurvedTranslateAnimation(path);

        }

    }



    private Path createCurvedPath(float fromX, float toX, float fromY, float toY) {

        final Path path = new Path();

        path.moveTo(fromX, fromY);



        if (fromY > toY) {

            // If the object needs to go up, move it in horizontal direction first, then vertical.

            path.cubicTo(fromX, fromY, toX, 0.9f * fromY + 0.1f * toY, toX, toY);

        } else {

            // If the object needs to go down, move it in vertical direction first, then horizontal.

            path.cubicTo(fromX, fromY, fromX, 0.1f * fromY + 0.9f * toY, toX, toY);

        }

        return path;

    }



    private long getAspectScaleDuration() {

        if (mNextAppTransition == TRANSIT_DOCK_TASK_FROM_RECENTS) {

            return (long) (THUMBNAIL_APP_TRANSITION_DURATION * 1.35f);

        } else {

        return THUMBNAIL_APP_TRANSITION_DURATION;

    }

    }



    private Interpolator getAspectScaleInterpolator() {

        if (mNextAppTransition == TRANSIT_DOCK_TASK_FROM_RECENTS) {

            return mFastOutSlowInInterpolator;

        } else {

        return TOUCH_RESPONSE_INTERPOLATOR;

    }

    }



    /**

     * This alternate animation is created when we are doing a thumbnail transition, for the
@@ -1734,7 +1696,6 @@ public class AppTransition implements Dump { 
                            ? WindowAnimation_activityCloseEnterAnimation

                            : WindowAnimation_activityCloseExitAnimation;

                    break;

                case TRANSIT_DOCK_TASK_FROM_RECENTS:

                case TRANSIT_TASK_OPEN:

                    animAttr = enter

                            ? WindowAnimation_taskOpenEnterAnimation
@@ -1805,7 +1766,6 @@ public class AppTransition implements Dump { 


    int getAppStackClipMode() {

        return mNextAppTransition == TRANSIT_ACTIVITY_RELAUNCH

                || mNextAppTransition == TRANSIT_DOCK_TASK_FROM_RECENTS

                || mNextAppTransitionType == NEXT_TRANSIT_TYPE_CLIP_REVEAL

                || mNextAppTransition == TRANSIT_KEYGUARD_GOING_AWAY

                || mNextAppTransition == TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER
@@ -2059,9 +2019,6 @@ public class AppTransition implements Dump { 
            case TRANSIT_ACTIVITY_RELAUNCH: {

                return "TRANSIT_ACTIVITY_RELAUNCH";

            }

            case TRANSIT_DOCK_TASK_FROM_RECENTS: {

                return "TRANSIT_DOCK_TASK_FROM_RECENTS";

            }

            case TRANSIT_KEYGUARD_GOING_AWAY: {

                return "TRANSIT_KEYGUARD_GOING_AWAY";

            }

services/core/java/com/android/server/wm/AppTransitionController.java

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE; 
import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN;

import static android.view.WindowManager.TRANSIT_ACTIVITY_RELAUNCH;

import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE;

import static android.view.WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE;
@@ -701,11 +700,9 @@ public class AppTransitionController { 
            boolean openingAppHasWallpaper, boolean closingAppHasWallpaper) {

        // Given no app transition pass it through instead of a wallpaper transition.

        // Never convert the crashing transition.

        // Never update the transition for the wallpaper if we are just docking from recents

        // Never convert a change transition since the top activity isn't changing and will likely

        // still be above an opening wallpaper.

        if (transit == TRANSIT_NONE || transit == TRANSIT_CRASHING_ACTIVITY_CLOSE

                || transit == TRANSIT_DOCK_TASK_FROM_RECENTS

                || AppTransition.isChangeTransit(transit)) {

            return transit;

        }