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

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

Merge "Fix artifact with LayoutTransitions on disappearing window."

parents d857837d 3c4ce72c

core/java/android/animation/ObjectAnimator.java

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ public final class ObjectAnimator extends ValueAnimator { 
    @Override

    public void start() {

        if (DBG) {

            Log.d("ObjectAnimator", "Anim target, duration" + mTarget + ", " + getDuration());

            Log.d("ObjectAnimator", "Anim target, duration: " + mTarget + ", " + getDuration());

            for (int i = 0; i < mValues.length; ++i) {

                PropertyValuesHolder pvh = mValues[i];

                ArrayList<Keyframe> keyframes = pvh.mKeyframeSet.mKeyframes;

core/java/android/view/ViewRootImpl.java

+5 −0
Original line number Diff line number Diff line
@@ -1599,6 +1599,11 @@ public final class ViewRootImpl extends Handler implements ViewParent, 
                }

            }

        } else {

            // If we're not drawing, then we don't need to draw the transitions, either

            if (mPendingTransitions != null) {

                mPendingTransitions.clear();

            }



            // We were supposed to report when we are done drawing. Since we canceled the

            // draw, remember it here.

            if ((relayoutResult&WindowManagerImpl.RELAYOUT_FIRST_TIME) != 0) {

packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, 
        public boolean onPreDraw() {

            getViewTreeObserver().removeOnPreDrawListener(this);

            mChoreo.startAnimation(true);

            return true;

            return false;

        }

    };