Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I5146e43ef1171e6910da2d1e790e95aa58ed2924
This commit is contained in:
Adrian Roos
2020-05-27 18:48:48 +00:00
committed by Automerger Merge Worker
parent 752649ee64 c42264c804
commit 810d33dc85
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/InsetsController.java
View File

@@ -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);