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

Commit d02d0b56 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:... 

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

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



Change-Id: Ied4838665296612c49df92f4412ee94d9ca53521
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9bfa032 d75fd2ab

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

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

    @Override

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

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

            Rect outSurfaceInsets) {

            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();

        final WindowState windowState = getTopVisibleAppMainWindow();

        if (windowState != null) {

        if (windowState != null) {

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

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

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

+3 −1
Original line number Original line 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_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

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_BEHIND;

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

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

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

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

        if (isOrganized()

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

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

                && getWindowingMode() != WINDOWING_MODE_FULLSCREEN

                && getWindowingMode() != WINDOWING_MODE_FULLSCREEN

                && getWindowingMode() != WINDOWING_MODE_FREEFORM) {

                && getWindowingMode() != WINDOWING_MODE_FREEFORM

                && getWindowingMode() != WINDOWING_MODE_MULTI_WINDOW) {

            return null;

            return null;

        }

        }