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

Commit 2d46fcc6 authored by Chet Haase's avatar Chet Haase
Browse files

Minor small fixes to old Animation code and docs. 

Change-Id: Ib8a1ba2d12e26cc42a2cec48312a5229bb6d4e8a
parent 01583ef7

core/java/android/view/ViewGroup.java

+7 −1
Original line number Diff line number Diff line
@@ -3056,8 +3056,14 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    }



    /**

     * {@inheritDoc}

     *

     * Sets  <code>t</code> to be the static transformation of the child, if set, returning a

     * boolean to indicate whether a static transform was set. The default implementation

     * simply returns <code>false</code>; subclasses may override this method for different

     * behavior.

     *

     * @param child The child view whose static transform is being requested

     * @param t The Transformation which will hold the result

     * @return true if the transformation was set, false otherwise

     * @see #setStaticTransformationsEnabled(boolean)

     */

    protected boolean getChildStaticTransformation(View child, Transformation t) {

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

+3 −1
Original line number Diff line number Diff line
@@ -224,7 +224,9 @@ public class AnimationSet extends Animation { 
        }



        boolean changeBounds = (mFlags & PROPERTY_CHANGE_BOUNDS_MASK) == 0;

        if (changeBounds && a.willChangeTransformationMatrix()) {





        if (changeBounds && a.willChangeBounds()) {

            mFlags |= PROPERTY_CHANGE_BOUNDS_MASK;

        }

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

+8 −0
Original line number Diff line number Diff line
@@ -133,6 +133,14 @@ public class AnimationUtils { 


    }



    /**

     * Loads a {@link LayoutAnimationController} object from a resource

     *

     * @param context Application context used to access resources

     * @param id The resource id of the animation to load

     * @return The animation object reference by the specified id

     * @throws NotFoundException when the layout animation controller cannot be loaded

     */

    public static LayoutAnimationController loadLayoutAnimation(Context context, int id)

            throws NotFoundException {