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

Commit 9f90c4ce authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Allow task fragment to use higher animation level" into sc-v2-dev am: 5df7e132 

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

Change-Id: If3b264f2e05b03c5ea01b18dfa0c7d29f4849c36
parents bccc0b4f 5df7e132

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

+0 −13
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ import android.util.TypedXmlSerializer; 
import android.util.proto.ProtoOutputStream;

import android.view.DisplayInfo;

import android.view.RemoteAnimationAdapter;

import android.view.RemoteAnimationTarget;

import android.view.Surface;

import android.view.SurfaceControl;

import android.view.WindowManager;
@@ -3031,18 +3030,6 @@ class Task extends TaskFragment { 
        return isAnimating(CHILDREN, ANIMATION_TYPE_RECENTS);

    }



    @Override

    RemoteAnimationTarget createRemoteAnimationTarget(

            RemoteAnimationController.RemoteAnimationRecord record) {

        final ActivityRecord activity = getTopMostActivity();

        return activity != null ? activity.createRemoteAnimationTarget(record) : null;

    }



    @Override

    boolean canCreateRemoteAnimationTarget() {

        return true;

    }



    WindowState getTopVisibleAppMainWindow() {

        final ActivityRecord activity = getTopVisibleActivity();

        return activity != null ? activity.findMainWindow() : null;

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

+13 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import android.util.DisplayMetrics; 
import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.view.DisplayInfo;

import android.view.RemoteAnimationTarget;

import android.view.SurfaceControl;

import android.window.ITaskFragmentOrganizer;

import android.window.TaskFragmentInfo;
@@ -1487,6 +1488,18 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        // No app transition applied to the task fragment.

    }



    @Override

    RemoteAnimationTarget createRemoteAnimationTarget(

            RemoteAnimationController.RemoteAnimationRecord record) {

        final ActivityRecord activity = getTopMostActivity();

        return activity != null ? activity.createRemoteAnimationTarget(record) : null;

    }



    @Override

    boolean canCreateRemoteAnimationTarget() {

        return true;

    }



    boolean shouldSleepActivities() {

        return false;

    }