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

Commit 13a6bfe7 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Remove leftover cancelledUserAnimationTypes" into main

parents c0ddfda6 02f0a106

core/java/android/view/InsetsController.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -884,7 +884,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
        mState.set(newState, 0 /* types */);

        mState.set(newState, 0 /* types */);

        @InsetsType int existingTypes = 0;

        @InsetsType int existingTypes = 0;

        @InsetsType int visibleTypes = 0;

        @InsetsType int visibleTypes = 0;

        @InsetsType int[] cancelledUserAnimationTypes = {0};

        for (int i = 0, size = newState.sourceSize(); i < size; i++) {

        for (int i = 0, size = newState.sourceSize(); i < size; i++) {

            final InsetsSource source = new InsetsSource(newState.sourceAt(i));

            final InsetsSource source = new InsetsSource(newState.sourceAt(i));

            @InsetsType int type = source.getType();

            @InsetsType int type = source.getType();
@@ -917,10 +916,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
            mExistingTypes = existingTypes;

            mExistingTypes = existingTypes;

        }

        }

        InsetsState.traverse(mState, newState, mRemoveGoneSources);

        InsetsState.traverse(mState, newState, mRemoveGoneSources);



        if (cancelledUserAnimationTypes[0] != 0) {

            mHandler.post(() -> show(cancelledUserAnimationTypes[0]));

        }

    }

    }





    /**

    /**