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

Commit 18728b32 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Add API for extending windows during animations 

Provides an API for windows to extend themselves outwards during
animations. In contrast to the scale animation the activity is not
distorted but rather the surface is extended outwards by the specified
amount without modifying the original window. The new "extension" space that is added is filled by clamping the edges of the surface. In the future the API could be extended to support different modes of filling the extension areas if required.

This API allows for the extension amount of the window to be animated
much like a scale or cliprect animation is, by providing a starting
amount for the extension and transitioning to the end amount by the end
of the animation.

This is required for the go/t-activity-transitions (https://direct.googleplex.com/#/spec/241720001&247800001) which we want to use as the default transition for T.

Test: atest CtsWindowManagerDeviceTestCases:AnimationEdgeExtensionTests
Bug: 202844659
Change-Id: Ic21e139fe329c271e71abdc6e77714c49365d5d6
parent c5743eea

core/api/current.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -729,6 +729,10 @@ package android { 
    field public static final int freezesText = 16843116; // 0x101016c

    field public static final int freezesText = 16843116; // 0x101016c

    field public static final int fromAlpha = 16843210; // 0x10101ca

    field public static final int fromAlpha = 16843210; // 0x10101ca

    field public static final int fromDegrees = 16843187; // 0x10101b3

    field public static final int fromDegrees = 16843187; // 0x10101b3

    field public static final int fromExtendBottom;

    field public static final int fromExtendLeft;

    field public static final int fromExtendRight;

    field public static final int fromExtendTop;

    field public static final int fromId = 16843850; // 0x101044a

    field public static final int fromId = 16843850; // 0x101044a

    field public static final int fromScene = 16843741; // 0x10103dd

    field public static final int fromScene = 16843741; // 0x10103dd

    field public static final int fromXDelta = 16843206; // 0x10101c6

    field public static final int fromXDelta = 16843206; // 0x10101c6
@@ -1574,6 +1578,10 @@ package android { 
    field public static final int titleTextStyle = 16843512; // 0x10102f8

    field public static final int titleTextStyle = 16843512; // 0x10102f8

    field public static final int toAlpha = 16843211; // 0x10101cb

    field public static final int toAlpha = 16843211; // 0x10101cb

    field public static final int toDegrees = 16843188; // 0x10101b4

    field public static final int toDegrees = 16843188; // 0x10101b4

    field public static final int toExtendBottom;

    field public static final int toExtendLeft;

    field public static final int toExtendRight;

    field public static final int toExtendTop;

    field public static final int toId = 16843849; // 0x1010449

    field public static final int toId = 16843849; // 0x1010449

    field public static final int toScene = 16843742; // 0x10103de

    field public static final int toScene = 16843742; // 0x10103de

    field public static final int toXDelta = 16843207; // 0x10101c7

    field public static final int toXDelta = 16843207; // 0x10101c7

core/java/android/view/animation/Animation.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -864,6 +864,15 @@ public abstract class Animation implements Cloneable { 
        return mHasRoundedCorners;

        return mHasRoundedCorners;

    }

    }





    /**

     * @return if a window animation has outsets applied to it.

     *

     * @hide

     */

    public boolean hasExtension() {

        return false;

    }



    /**

    /**

     * If showBackground is {@code true} and this animation is applied on a window, then the windows

     * If showBackground is {@code true} and this animation is applied on a window, then the windows

     * in the animation will animate with the background associated with this window behind them.

     * in the animation will animate with the background associated with this window behind them.

core/java/android/view/animation/AnimationSet.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -517,4 +517,15 @@ public class AnimationSet extends Animation { 
    public boolean willChangeBounds() {

    public boolean willChangeBounds() {

        return (mFlags & PROPERTY_CHANGE_BOUNDS_MASK) == PROPERTY_CHANGE_BOUNDS_MASK;

        return (mFlags & PROPERTY_CHANGE_BOUNDS_MASK) == PROPERTY_CHANGE_BOUNDS_MASK;

    }

    }



    /** @hide */

    @Override

    public boolean hasExtension() {

        for (Animation animation : mAnimations) {

            if (animation.hasExtension()) {

                return true;

            }

        }

        return false;

    }

}
 
}

core/java/android/view/animation/AnimationUtils.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -190,6 +190,8 @@ public class AnimationUtils { 
                anim = new TranslateAnimation(c, attrs);

                anim = new TranslateAnimation(c, attrs);

            } else if (name.equals("cliprect")) {

            } else if (name.equals("cliprect")) {

                anim = new ClipRectAnimation(c, attrs);

                anim = new ClipRectAnimation(c, attrs);

            } else if (name.equals("extend")) {

                anim = new ExtendAnimation(c, attrs);

            } else {

            } else {

                throw new RuntimeException("Unknown animation name: " + parser.getName());

                throw new RuntimeException("Unknown animation name: " + parser.getName());

            }

            }

core/java/android/view/animation/ExtendAnimation.java

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

 * Copyright (C) 2022 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 android.view.animation;



import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.Insets;

import android.util.AttributeSet;



/**

 * An animation that controls the outset of an object.

 *

 * @hide

 */

public class ExtendAnimation extends Animation {

    protected Insets mFromInsets = Insets.NONE;

    protected Insets mToInsets = Insets.NONE;



    private int mFromLeftType = ABSOLUTE;

    private int mFromTopType = ABSOLUTE;

    private int mFromRightType = ABSOLUTE;

    private int mFromBottomType = ABSOLUTE;



    private int mToLeftType = ABSOLUTE;

    private int mToTopType = ABSOLUTE;

    private int mToRightType = ABSOLUTE;

    private int mToBottomType = ABSOLUTE;



    private float mFromLeftValue;

    private float mFromTopValue;

    private float mFromRightValue;

    private float mFromBottomValue;



    private float mToLeftValue;

    private float mToTopValue;

    private float mToRightValue;

    private float mToBottomValue;



    /**

     * Constructor used when an ExtendAnimation is loaded from a resource.

     *

     * @param context Application context to use

     * @param attrs Attribute set from which to read values

     */

    public ExtendAnimation(Context context, AttributeSet attrs) {

        super(context, attrs);



        TypedArray a = context.obtainStyledAttributes(attrs,

                com.android.internal.R.styleable.ExtendAnimation);



        Description d = Description.parseValue(a.peekValue(

                com.android.internal.R.styleable.ExtendAnimation_fromExtendLeft));

        mFromLeftType = d.type;

        mFromLeftValue = d.value;



        d = Description.parseValue(a.peekValue(

                com.android.internal.R.styleable.ExtendAnimation_fromExtendTop));

        mFromTopType = d.type;

        mFromTopValue = d.value;



        d = Description.parseValue(a.peekValue(

                com.android.internal.R.styleable.ExtendAnimation_fromExtendRight));

        mFromRightType = d.type;

        mFromRightValue = d.value;



        d = Description.parseValue(a.peekValue(

                com.android.internal.R.styleable.ExtendAnimation_fromExtendBottom));

        mFromBottomType = d.type;

        mFromBottomValue = d.value;





        d = Description.parseValue(a.peekValue(

                com.android.internal.R.styleable.ExtendAnimation_toExtendLeft));

        mToLeftType = d.type;

        mToLeftValue = d.value;



        d = Description.parseValue(a.peekValue(

                com.android.internal.R.styleable.ExtendAnimation_toExtendTop));

        mToTopType = d.type;

        mToTopValue = d.value;



        d = Description.parseValue(a.peekValue(

                com.android.internal.R.styleable.ExtendAnimation_toExtendRight));

        mToRightType = d.type;

        mToRightValue = d.value;



        d = Description.parseValue(a.peekValue(

                com.android.internal.R.styleable.ExtendAnimation_toExtendBottom));

        mToBottomType = d.type;

        mToBottomValue = d.value;



        a.recycle();

    }



    /**

     * Constructor to use when building an ExtendAnimation from code

     *

     * @param fromInsets the insets to animate from

     * @param toInsets the insets to animate to

     */

    public ExtendAnimation(Insets fromInsets, Insets toInsets) {

        if (fromInsets == null || toInsets == null) {

            throw new RuntimeException("Expected non-null animation outsets");

        }

        mFromLeftValue = -fromInsets.left;

        mFromTopValue = -fromInsets.top;

        mFromRightValue = -fromInsets.right;

        mFromBottomValue = -fromInsets.bottom;



        mToLeftValue = -toInsets.left;

        mToTopValue = -toInsets.top;

        mToRightValue = -toInsets.right;

        mToBottomValue = -toInsets.bottom;

    }



    /**

     * Constructor to use when building an ExtendAnimation from code

     */

    public ExtendAnimation(int fromL, int fromT, int fromR, int fromB,

            int toL, int toT, int toR, int toB) {

        this(Insets.of(-fromL, -fromT, -fromR, -fromB), Insets.of(-toL, -toT, -toR, -toB));

    }



    @Override

    protected void applyTransformation(float it, Transformation tr) {

        int l = mFromInsets.left + (int) ((mToInsets.left - mFromInsets.left) * it);

        int t = mFromInsets.top + (int) ((mToInsets.top - mFromInsets.top) * it);

        int r = mFromInsets.right + (int) ((mToInsets.right - mFromInsets.right) * it);

        int b = mFromInsets.bottom + (int) ((mToInsets.bottom - mFromInsets.bottom) * it);

        tr.setInsets(l, t, r, b);

    }



    @Override

    public boolean willChangeTransformationMatrix() {

        return false;

    }



    /** @hide */

    @Override

    public boolean hasExtension() {

        return mFromInsets.left < 0 || mFromInsets.top < 0 || mFromInsets.right < 0

                || mFromInsets.bottom < 0;

    }



    @Override

    public void initialize(int width, int height, int parentWidth, int parentHeight) {

        super.initialize(width, height, parentWidth, parentHeight);

        // We remove any negative extension (i.e. positive insets) and set those to 0

        mFromInsets = Insets.min(Insets.of(

                    -(int) resolveSize(mFromLeftType, mFromLeftValue, width, parentWidth),

                    -(int) resolveSize(mFromTopType, mFromTopValue, height, parentHeight),

                    -(int) resolveSize(mFromRightType, mFromRightValue, width, parentWidth),

                    -(int) resolveSize(mFromBottomType, mFromBottomValue, height, parentHeight)

                ), Insets.NONE);

        mToInsets = Insets.min(Insets.of(

                    -(int) resolveSize(mToLeftType, mToLeftValue, width, parentWidth),

                    -(int) resolveSize(mToTopType, mToTopValue, height, parentHeight),

                    -(int) resolveSize(mToRightType, mToRightValue, width, parentWidth),

                    -(int) resolveSize(mToBottomType, mToBottomValue, height, parentHeight)

                ), Insets.NONE);

    }

}