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

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

Merge "Fix in transition canceling logic"

parents 58f92ccb 25a738fb

core/java/android/view/transition/Transition.java

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ public abstract class Transition { 
        // TODO: how does this work with instances?

        // TODO: this doesn't actually do *anything* yet

        int numAnimators = mCurrentAnimators.size();

        for (int i = 0; i < numAnimators; ++i) {

        for (int i = numAnimators - 1; i >= 0; i--) {

            Animator animator = mCurrentAnimators.get(i);

            animator.cancel();

        }

tests/TransitionTests/res/layout/interruption_inner_1.xml

+7 −0
Original line number Diff line number Diff line
@@ -9,5 +9,12 @@ 
            android:layout_alignParentTop="true"

            android:layout_alignParentLeft="true"

            android:text="@string/state1"/>

    <Button

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:id="@+id/button1"

            android:layout_alignLeft="@+id/button"

            android:layout_below="@+id/button"

            android:text="@string/state1"/>



</RelativeLayout>
 
 No newline at end of file

tests/TransitionTests/res/layout/interruption_inner_2.xml

+7 −0
Original line number Diff line number Diff line
@@ -9,5 +9,12 @@ 
            android:id="@+id/button"

            android:layout_alignParentRight="true"

            android:text="@string/state2"/>

    <Button

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:id="@+id/button1"

            android:layout_alignLeft="@+id/button"

            android:layout_below="@+id/button"

            android:text="@string/state2"/>



</RelativeLayout>
 
 No newline at end of file

tests/TransitionTests/res/layout/interruption_inner_3.xml

+7 −0
Original line number Diff line number Diff line
@@ -9,5 +9,12 @@ 
            android:layout_alignParentBottom="true"

            android:layout_alignParentLeft="true"

            android:text="@string/state3"/>

    <Button

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:id="@+id/button1"

            android:layout_alignLeft="@+id/button"

            android:layout_above="@+id/button"

            android:text="@string/state3"/>



</RelativeLayout>
 
 No newline at end of file

tests/TransitionTests/res/layout/interruption_inner_4.xml

+7 −0
Original line number Diff line number Diff line
@@ -9,5 +9,12 @@ 
            android:layout_alignParentBottom="true"

            android:layout_alignParentRight="true"

            android:text="@string/state4"/>

    <Button

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:id="@+id/button1"

            android:layout_alignLeft="@+id/button"

            android:layout_above="@+id/button"

            android:text="@string/state4"/>



</RelativeLayout>
 
 No newline at end of file