From 56fd70cd8ce992cf7f673908540607365b643743 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Thu, 27 Oct 2016 19:57:08 -0700 Subject: [PATCH] The big Keyguard transition refactor (7/n) There was some window animation jank because we ran a layout during the animation, as the SysUI animations are slightly faster, so we collapsed the window already during the animation which caused a layout which caused window animation jank. Bug: 32057734 Change-Id: I296f961be8cfc39b08859b7d3d41f1e81b2eaaa3 --- .../statusbar/phone/StatusBarKeyguardViewManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index d296498c6d42a..f5c5e56359a7d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -48,7 +48,7 @@ import static com.android.systemui.statusbar.phone.FingerprintUnlockController.* public class StatusBarKeyguardViewManager implements RemoteInputController.Callback { // When hiding the Keyguard with timing supplied from WindowManager, better be early than late. - private static final long HIDE_TIMING_CORRECTION_MS = -3 * 16; + private static final long HIDE_TIMING_CORRECTION_MS = - 16 * 3; // Delay for showing the navigation bar when the bouncer appears. This should be kept in sync // with the appear animations of the PIN/pattern/password views. @@ -396,7 +396,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb if (endRunnable != null) { endRunnable.run(); } - mStatusBarWindowManager.setKeyguardFadingAway(false); + mContainer.postDelayed(() -> mStatusBarWindowManager.setKeyguardFadingAway(false), + 100); mPhoneStatusBar.finishKeyguardFadingAway(); mFingerprintUnlockController.finishKeyguardFadingAway(); WindowManagerGlobal.getInstance().trimMemory(