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

Merge "Workaround to force show TaskFragment while back gesture animating." into udc-dev am: 6b02ff5740

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

Change-Id: I4c52b6c0eaaa96b3a2fbbd09aeb9de3b5ddbd94c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2023-03-15 04:05:31 +00:00
committed by Automerger Merge Worker
parent 8a295a2f99 6b02ff5740
commit 1e6c5cc5d6
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -862,8 +862,16 @@ class BackNavigationController {
WindowContainer target, boolean isOpen) { WindowContainer target, boolean isOpen) {
final BackWindowAnimationAdaptor adaptor = final BackWindowAnimationAdaptor adaptor =
new BackWindowAnimationAdaptor(target, isOpen); new BackWindowAnimationAdaptor(target, isOpen);
target.startAnimation(target.getPendingTransaction(), adaptor, false /* hidden */, final SurfaceControl.Transaction pt = target.getPendingTransaction();
ANIMATION_TYPE_PREDICT_BACK); target.startAnimation(pt, adaptor, false /* hidden */, ANIMATION_TYPE_PREDICT_BACK);
// Workaround to show TaskFragment which can be hide in Transitions and won't show
// during isAnimating.
if (isOpen && target.asActivityRecord() != null) {
final TaskFragment fragment = target.asActivityRecord().getTaskFragment();
if (fragment != null) {
pt.show(fragment.mSurfaceControl);
}
}
return adaptor; return adaptor;
} }