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

Merge "Fixes wallpaper's orientation mismatch the opening target."

Browse Source
This commit is contained in:
Wei Sheng Shih
2022-11-15 04:45:34 +00:00
committed by Android (Google) Code Review
parent 16c0e8925b 8bbcf13926
commit 9452d8bc52
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/BackNavigationController.java
View File

@@ -19,6 +19,7 @@ package com.android.server.wm;
import static android.view.RemoteAnimationTarget.MODE_CLOSING;
import static android.view.RemoteAnimationTarget.MODE_OPENING;
import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE;
import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
import static android.view.WindowManager.TRANSIT_CLOSE;
import static android.view.WindowManager.TRANSIT_TO_BACK;
@@ -831,9 +832,8 @@ class BackNavigationController {
}
boolean isWallpaperVisible(WindowState w) {
if (mBackAnimationInProgress && w.isFocused()) {
return mShowWallpaper;
}
return false;
return mAnimationTargets.mComposed && mShowWallpaper
&& w.mAttrs.type == TYPE_BASE_APPLICATION && w.mActivityRecord != null
&& mAnimationTargets.isTarget(w.mActivityRecord, true /* open */);
}
}