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

Commit 5df7e132 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Allow task fragment to use higher animation level" into sc-v2-dev

parents 138f08b5 80e14877

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;

    }