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

Commit 052cb99b authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge changes from topic "edge-extension" 

* changes:
  Support edge extension of windows during animations in shell
  Add API for extending windows during animations
parents 8d12bd57 108a2ad1

core/api/current.txt

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

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

    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 fromScene = 16843741; // 0x10103dd

    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 toAlpha = 16843211; // 0x10101cb

    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 toScene = 16843742; // 0x10103de

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

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

+25 −2
Original line number Diff line number Diff line
@@ -864,6 +864,15 @@ public abstract class Animation implements Cloneable { 
        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

     * in the animation will animate with the background associated with this window behind them.
@@ -941,6 +950,21 @@ public abstract class Animation implements Cloneable { 
        return (getStartOffset() + getDuration()) * (getRepeatCount() + 1);

    }



    /**

     * Gets the transformation to apply a specific point in time. Implementations of this method

     * should always be kept in sync with getTransformation.

     *

     * @param normalizedTime time between 0 and 1 where 0 is the start of the animation and 1 the

     *                       end.

     * @param outTransformation A transformation object that is provided by the

     *        caller and will be filled in by the animation.

     * @hide

     */

    public void getTransformationAt(float normalizedTime, Transformation outTransformation) {

        final float interpolatedTime = mInterpolator.getInterpolation(normalizedTime);

        applyTransformation(interpolatedTime, outTransformation);

    }



    /**

     * Gets the transformation to apply at a specified point in time. Implementations of this

     * method should always replace the specified Transformation or document they are doing
@@ -987,8 +1011,7 @@ public abstract class Animation implements Cloneable { 
                normalizedTime = 1.0f - normalizedTime;

            }



            final float interpolatedTime = mInterpolator.getInterpolation(normalizedTime);

            applyTransformation(interpolatedTime, outTransformation);

            getTransformationAt(normalizedTime, outTransformation);

        }



        if (expired) {

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

+31 −0
Original line number Diff line number Diff line
@@ -359,6 +359,26 @@ public class AnimationSet extends Animation { 
        }

    }



    /**

     * The transformation of an animation set is the concatenation of all of its

     * component animations.

     *

     * @see android.view.animation.Animation#getTransformationAt

     * @hide

     */

    @Override

    public void getTransformationAt(float interpolatedTime, Transformation t) {

        final Transformation temp = mTempTransformation;



        for (int i = mAnimations.size() - 1; i >= 0; --i) {

            final Animation a = mAnimations.get(i);



            temp.clear();

            a.getTransformationAt(interpolatedTime, t);

            t.compose(temp);

        }

    }



    /**

     * The transformation of an animation set is the concatenation of all of its

     * component animations.
@@ -517,4 +537,15 @@ public class AnimationSet extends Animation { 
    public boolean willChangeBounds() {

        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 Diff line number Diff line
@@ -190,6 +190,8 @@ public class AnimationUtils { 
                anim = new TranslateAnimation(c, attrs);

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

                anim = new ClipRectAnimation(c, attrs);

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

                anim = new ExtendAnimation(c, attrs);

            } else {

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

            }

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

0 → 100644
+176 −0
Original line number 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);

    }

}