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

Commit ed5789bb authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Fix activity scene transition 

- The activities behind a fullscreen activity will be invisible.
  So the ActivityRecord#fullscreen still needs to be updated
  with occluding state.
- Even there is no translucent change, if the options are
  given, it will require a visibility update to apply the
  options (e.g. the shared element) to the target activity.

Fix: 139666655
Fix: 139672142
Test: atest CtsTransitionTestCases:ActivityTransitionTest

Change-Id: I330e10c9947f835663e44d4ca2c4850be84d4852
parent ee1ac463

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

+6 −0
Original line number Diff line number Diff line
@@ -1380,6 +1380,12 @@ final class ActivityRecord extends ConfigurationContainer { 
            }

            // Keep track of the number of fullscreen activities in this task.

            task.numFullscreen += occludesParent ? +1 : -1;

            fullscreen = occludesParent;

        }

        // Always ensure visibility if this activity doesn't occlude parent, so the

        // {@link #returningOptions} of the activity under this one can be applied in

        // {@link #handleAlreadyVisible()}.

        if (changed || !occludesParent) {

            mRootActivityContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);

        }

        return changed;