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

Commit 64b20a6d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix getAnimationTargets so that it returns valid animation target" into... 

Merge "Fix getAnimationTargets so that it returns valid animation target" into rvc-dev am: b99646f2 am: a466c84f am: e300b308

Change-Id: I714008ca90923b3e73024288e6990bb383e1ce65
parents 3bed0f03 e300b308

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

+5 −0
Original line number Diff line number Diff line
@@ -7627,6 +7627,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                record.mStartBounds);

    }



    @Override

    boolean canCreateRemoteAnimationTarget() {

        return true;

    }



    @Override

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

            Rect outSurfaceInsets) {

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

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ public class AppTransitionController { 
            siblings.add(current);

            boolean canPromote = true;



            if (parent == null) {

            if (parent == null || !parent.canCreateRemoteAnimationTarget()) {

                canPromote = false;

            } else {

                // In case a descendant of the parent belongs to the other group, we cannot promote

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

+5 −0
Original line number Diff line number Diff line
@@ -3121,6 +3121,11 @@ class Task extends WindowContainer<WindowContainer> { 
        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/WindowContainer.java

+4 −0
Original line number Diff line number Diff line
@@ -2196,6 +2196,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        return null;

    }



    boolean canCreateRemoteAnimationTarget() {

        return false;

    }



    boolean okToDisplay() {

        final DisplayContent dc = getDisplayContent();

        return dc != null && dc.okToDisplay();