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

Merge "Don't apply remote animation on IME when keyguad is going away." into sc-dev

Browse Source
This commit is contained in:
Issei Suzuki
2021-06-28 06:10:02 +00:00
committed by Android (Google) Code Review
parent 556ca21ecf 49f713eaf2
commit 0be68ccabb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/NonAppWindowAnimationAdapter.java
View File

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