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

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

Merge "InsetsController: Maintain type user animation when restarting input"... 

Merge "InsetsController: Maintain type user animation when restarting input" into rvc-dev am: 792dc29a am: f879f1cb

Change-Id: I8219b551b000c85b7450d7654896f3983b8e55a8
parents dd6a4b47 f879f1cb

core/java/android/view/InsetsController.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -745,6 +745,10 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
                        consumer.getType(), animationType, consumer.isRequestedVisible()));

                        consumer.getType(), animationType, consumer.isRequestedVisible()));

                continue;

                continue;

            }

            }

            if (fromIme && animationType == ANIMATION_TYPE_USER) {

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

                continue;

            }

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

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

        }

        }

        if (DEBUG) Log.d(TAG, "show typesReady: " + typesReady);

        if (DEBUG) Log.d(TAG, "show typesReady: " + typesReady);