Don't apply remote animation on IME when keyguad is going away.

Test: manual.
  1. set lock mode to password
  2. push power button to go to the lock screen.
  3. swipe up to show password input screen.
  4. input correct password.
  5. verify keyguard is faded out without flicker.
Bug: 191518142
Change-Id: Ia9b55d786fda040df658889c90040326d5c8aa6a
This commit is contained in:
Issei Suzuki
2021-06-25 17:31:52 +02:00
parent 2adcf7686d
commit 49f713eaf2

View File

@@ -99,8 +99,10 @@ class NonAppWindowAnimationAdapter implements AnimationAdapter {
final WindowManagerPolicy policy = service.mPolicy;
service.mRoot.forAllWindows(nonAppWindow -> {
// Animation on the IME window is controlled via Insets.
if (nonAppWindow.mActivityRecord == null && policy.canBeHiddenByKeyguardLw(nonAppWindow)
&& nonAppWindow.wouldBeVisibleIfPolicyIgnored() && !nonAppWindow.isVisible()) {
&& nonAppWindow.wouldBeVisibleIfPolicyIgnored() && !nonAppWindow.isVisible()
&& nonAppWindow != service.mRoot.getCurrentInputMethodWindow()) {
final NonAppWindowAnimationAdapter nonAppAdapter = new NonAppWindowAnimationAdapter(
nonAppWindow, durationHint, statusBarTransitionDelay);
adaptersOut.add(nonAppAdapter);