Merge "Allowing activity visible behind translucent adjacent TaskFragments" into sc-v2-dev

2021-11-03 06:32:05 +00:00
parent eb8b4fdec8 a4bf8c8410
commit 9d25f3fbe8
1 changed files with 6 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
+++ b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
@@ -119,8 +119,12 @@ class EnsureActivitiesVisibleHelper {

                if (adjacentTaskFragments != null && adjacentTaskFragments.contains(
                        childTaskFragment)) {
-                    // Everything behind two adjacent TaskFragments are occluded.
-                    mBehindFullyOccludedContainer = true;
+                    if (!childTaskFragment.isTranslucent(starting)
+                            && !childTaskFragment.getAdjacentTaskFragment().isTranslucent(
+                                    starting)) {
+                        // Everything behind two adjacent TaskFragments are occluded.
+                        mBehindFullyOccludedContainer = true;
+                    }
                    continue;
                }