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

Commit 2b8d80b8 authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

Merge "WindowInsetsAnimation: Fix app driven closing of IME" into rvc-dev am: 56f4b1b9 

Change-Id: I42dc07978134b80aea85ae5bb7de24474f5c3b96
parents bbec0bba 56f4b1b9

core/java/android/view/ImeInsetsSourceConsumer.java

+2 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.view;



import static android.view.InsetsController.ANIMATION_TYPE_USER;

import static android.view.InsetsController.AnimationType;

import static android.view.InsetsState.ITYPE_IME;
@@ -104,13 +103,9 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { 
    void hide(boolean animationFinished, @AnimationType int animationType) {

        super.hide();



        if (!animationFinished) {

            if (animationType == ANIMATION_TYPE_USER) {

                // if controlWindowInsetsAnimation is hiding keyboard.

                notifyHidden();

            }

        } else {

        if (animationFinished) {

            // remove IME surface as IME has finished hide animation.

            notifyHidden();

            removeSurface();

        }

    }