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

Commit df1423e2 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Adding new CHANGING transition to LayoutTransition."

parents 6849e4dd 7dd4a536

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -2311,6 +2311,8 @@ package android.animation { 
    ctor public LayoutTransition();

    method public void addChild(android.view.ViewGroup, android.view.View);

    method public void addTransitionListener(android.animation.LayoutTransition.TransitionListener);

    method public void disableTransitionType(int);

    method public void enableTransitionType(int);

    method public android.animation.Animator getAnimator(int);

    method public long getDuration(int);

    method public android.animation.TimeInterpolator getInterpolator(int);
@@ -2321,6 +2323,7 @@ package android.animation { 
    method public void hideChild(android.view.ViewGroup, android.view.View, int);

    method public boolean isChangingLayout();

    method public boolean isRunning();

    method public boolean isTransitionTypeEnabled(int);

    method public void removeChild(android.view.ViewGroup, android.view.View);

    method public void removeTransitionListener(android.animation.LayoutTransition.TransitionListener);

    method public void setAnimateParentHierarchy(boolean);
@@ -2335,6 +2338,7 @@ package android.animation { 
    field public static final int APPEARING = 2; // 0x2

    field public static final int CHANGE_APPEARING = 0; // 0x0

    field public static final int CHANGE_DISAPPEARING = 1; // 0x1

    field public static final int CHANGING = 4; // 0x4

    field public static final int DISAPPEARING = 3; // 0x3

  }

























core/java/android/animation/LayoutTransition.java



+273
−64


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/view/ViewGroup.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -4207,6 +4207,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager













    @Override















    public final void layout(int l, int t, int r, int b) {















        if (mTransition == null || !mTransition.isChangingLayout()) {













            if (mTransition != null) {













                mTransition.layoutChange(this);













            }















            super.layout(l, t, r, b);















        } else {















            // record the fact that we noop'd it; request layout when transition finishes