commit 3358b1c35dd5bdc0fd84d9ef3540b412de3c724b
author Wei Sheng Shih <wilsonshih@google.com> Wed Mar 15 03:50:33 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 15 03:50:33 2023 +0000
tree 982cb4a3c8b2ddbfba1bc2b795e015009851cec6
parent 5fe4ce3ac286fc3e361ebadffc0b919d22544064
parent 6b02ff574023751a50a036574292f08e95b92632

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

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

Change-Id: I2b80d2769af50057b8f1c1d842495abdd421edae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/wm/BackNavigationController.java

diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java
index f9f972c..b67bc62 100644
--- a/services/core/java/com/android/server/wm/BackNavigationController.java
+++ b/services/core/java/com/android/server/wm/BackNavigationController.java
@@ -862,8 +862,16 @@
                 WindowContainer target, boolean isOpen) {
             final BackWindowAnimationAdaptor adaptor =
                     new BackWindowAnimationAdaptor(target, isOpen);
-            target.startAnimation(target.getPendingTransaction(), adaptor, false /* hidden */,
-                    ANIMATION_TYPE_PREDICT_BACK);
+            final SurfaceControl.Transaction pt = target.getPendingTransaction();
+            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;
         }