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

Change-Id: I8219b551b000c85b7450d7654896f3983b8e55a8

core/java/android/view/InsetsController.java

@@ -745,6 +745,10 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
                         consumer.getType(), animationType, consumer.isRequestedVisible()));
                 continue;
             }
+            if (fromIme && animationType == ANIMATION_TYPE_USER) {
+                // App is already controlling the IME, don't cancel it.
+                continue;
+            }
             typesReady |= InsetsState.toPublicType(consumer.getType());
         }
         if (DEBUG) Log.d(TAG, "show typesReady: " + typesReady);