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

Merge "Set transient launch after collecting for recent at keyguard" into udc-qpr-dev am: ad3f3dbb49

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24036865

Change-Id: I802fb4bb0bae456a589bb924a89baff343eecc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-07-13 17:18:30 +00:00
committed by Automerger Merge Worker
parent 6a01267c1b ad3f3dbb49
commit 137176886c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -1591,6 +1591,9 @@ class ActivityStarter {
if (forceTransientTransition) { if (forceTransientTransition) {
transitionController.collect(mLastStartActivityRecord); transitionController.collect(mLastStartActivityRecord);
transitionController.collect(mPriorAboveTask); transitionController.collect(mPriorAboveTask);
// If keyguard is active and occluded, the transient target won't be moved to front
// to be collected, so set transient again after it is collected.
transitionController.setTransientLaunch(mLastStartActivityRecord, mPriorAboveTask);
final DisplayContent dc = mLastStartActivityRecord.getDisplayContent(); final DisplayContent dc = mLastStartActivityRecord.getDisplayContent();
// update wallpaper target to TransientHide // update wallpaper target to TransientHide
dc.mWallpaperController.adjustWallpaperWindows(); dc.mWallpaperController.adjustWallpaperWindows();