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

Commit a2d2ba7e authored by Adrian Roos's avatar Adrian Roos
Browse files

InsetsController: Maintain type user animation when restarting input 

When the IME restarts input, it re-requests to show itself. If the app is
already animating, we should maintain that animation instead of cancelling
it.

Fixes: 155962435
Test: atest WindowInsetsAnimationControllerTests
Change-Id: I57618e43b2cddc55e5dfc32111abbbd82cc6ed48
parent b0033693

core/java/android/view/InsetsController.java

+4 −0
Original line number Diff line number Diff line
@@ -713,6 +713,10 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
                // applied before starting animation).

                continue;

            }

            if (fromIme && animationType == ANIMATION_TYPE_USER) {

                // App is already controlling the IME, don't cancel it.

                continue;

            }

            typesReady |= InsetsState.toPublicType(consumer.getType());

        }

        applyAnimation(typesReady, true /* show */, fromIme);