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

Commit d75fd2ab authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Make split screen have enter and exit animation" into tm-qpr-dev am: c6bffbb3 

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



Change-Id: I544edae7a1f43656474b4486a698240d4869c9dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d4a71f6 c6bffbb3

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

+7 −0
Original line number Diff line number Diff line
@@ -2772,6 +2772,13 @@ class Task extends TaskFragment { 
    @Override

    void getAnimationFrames(Rect outFrame, Rect outInsets, Rect outStableInsets,

            Rect outSurfaceInsets) {

        // If this task has its adjacent task, it means they should animate together. Use display

        // bounds for them could move same as full screen task.

        if (getAdjacentTaskFragment() != null && getAdjacentTaskFragment().asTask() != null) {

            super.getAnimationFrames(outFrame, outInsets, outStableInsets, outSurfaceInsets);

            return;

        }



        final WindowState windowState = getTopVisibleAppMainWindow();

        if (windowState != null) {

            windowState.getAnimationFrames(outFrame, outInsets, outStableInsets, outSurfaceInsets);

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

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm; 


import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
@@ -3186,7 +3187,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        if (isOrganized()

                // TODO(b/161711458): Clean-up when moved to shell.

                && getWindowingMode() != WINDOWING_MODE_FULLSCREEN

                && getWindowingMode() != WINDOWING_MODE_FREEFORM) {

                && getWindowingMode() != WINDOWING_MODE_FREEFORM

                && getWindowingMode() != WINDOWING_MODE_MULTI_WINDOW) {

            return null;

        }