Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d85aaf0 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Workaround to force show TaskFragment while back gesture animating."... 

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

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



Change-Id: Ib47ada5f3a32e74d18c0f42d05657b709a956500
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8816cf53 3358b1c3

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

+10 −2
Original line number Diff line number Diff line
@@ -862,8 +862,16 @@ class BackNavigationController { 
                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;

        }