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

Commit 1a078491 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Prevent cancel entering split due to animation got canceled" into... 

Merge "Prevent cancel entering split due to animation got canceled" into tm-qpr-dev am: 788f62ae am: e75c1a26

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



Change-Id: I6f7beeccb666ad81082ead771b99bf2ef68f41d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96bf0b1d e75c1a26

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+12 −2
Original line number Diff line number Diff line
@@ -499,6 +499,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                            break;

                        }

                    }

                } else if (mSideStage.getChildCount() != 0) {

                    // There are chances the entering app transition got canceled by performing

                    // rotation transition. Checks if there is any child task existed in split

                    // screen before fallback to cancel entering flow.

                    openingToSide = true;

                }



                if (isEnteringSplit && !openingToSide) {
@@ -515,7 +520,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    }

                }



                if (!isEnteringSplit && openingToSide) {

                if (!isEnteringSplit && apps != null) {

                    final WindowContainerTransaction evictWct = new WindowContainerTransaction();

                    prepareEvictNonOpeningChildTasks(position, apps, evictWct);

                    mSyncQueue.queue(evictWct);
@@ -598,6 +603,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                            break;

                        }

                    }

                } else if (mSideStage.getChildCount() != 0) {

                    // There are chances the entering app transition got canceled by performing

                    // rotation transition. Checks if there is any child task existed in split

                    // screen before fallback to cancel entering flow.

                    openingToSide = true;

                }



                if (isEnteringSplit && !openingToSide && apps != null) {
@@ -624,7 +634,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                }





                if (!isEnteringSplit && openingToSide) {

                if (!isEnteringSplit && apps != null) {

                    final WindowContainerTransaction evictWct = new WindowContainerTransaction();

                    prepareEvictNonOpeningChildTasks(position, apps, evictWct);

                    mSyncQueue.queue(evictWct);