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

Commit 44421220 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Move policy handling into ATM hierarchy [2/n]"

parents 1a7b9e32 ed6767fe

core/proto/android/server/windowmanagerservice.proto

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ message TaskProto { 
    repeated AppWindowTokenProto app_window_tokens = 3;

    optional bool fills_parent = 4;

    optional .android.graphics.RectProto bounds = 5;

    optional .android.graphics.RectProto temp_inset_bounds = 6;

    optional .android.graphics.RectProto displayed_bounds = 6;

    optional bool defer_removal = 7;

    optional int32 surface_width = 8;

    optional int32 surface_height = 9;

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

+1 −1
Original line number Diff line number Diff line
@@ -2543,7 +2543,7 @@ final class ActivityRecord extends ConfigurationContainer { 


        // Bounds changed...update configuration to match.

        if (!matchParentBounds()) {

            task.computeOverrideConfiguration(mTmpConfig, updatedBounds, null /* insetBounds */,

            task.computeOverrideConfiguration(mTmpConfig, updatedBounds,

                    false /* overrideWidth */, false /* overrideHeight */);

        }

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

+6 −3
Original line number Diff line number Diff line
@@ -4944,9 +4944,12 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
                }

            }



            if (task.hasDisplayedBounds()) {

                mTmpBounds.put(task.taskId, task.getDisplayedBounds());

                mTmpInsetBounds.put(task.taskId, task.getOverrideBounds());

            } else {

                mTmpBounds.put(task.taskId, task.getOverrideBounds());

            if (tempTaskInsetBounds != null) {

                mTmpInsetBounds.put(task.taskId, tempTaskInsetBounds);

                mTmpInsetBounds.put(task.taskId, null);

            }

        }

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

+14 −2
Original line number Diff line number Diff line
@@ -2178,9 +2178,9 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        final TaskStack stack = getStack();

        final Task task = getTask();

        if (task != null && task.inFreeformWindowingMode()) {

            task.getRelativePosition(outPosition);

            task.getRelativeDisplayedPosition(outPosition);

        } else if (stack != null) {

            stack.getRelativePosition(outPosition);

            stack.getRelativeDisplayedPosition(outPosition);

        }



        // Always use stack bounds in order to have the ability to animate outside the task region.
@@ -2193,6 +2193,18 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        outBounds.offsetTo(0, 0);

    }



    @Override

    Rect getDisplayedBounds() {

        final Task task = getTask();

        if (task != null) {

            final Rect overrideDisplayedBounds = task.getOverrideDisplayedBounds();

            if (!overrideDisplayedBounds.isEmpty()) {

                return overrideDisplayedBounds;

            }

        }

        return getBounds();

    }



    boolean applyAnimationLocked(WindowManager.LayoutParams lp, int transit, boolean enter,

            boolean isVoiceInteraction) {

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

+2 −2
Original line number Diff line number Diff line
@@ -603,8 +603,8 @@ public class RecentsAnimationController implements DeathRecipient { 
            mTask = task;

            mIsRecentTaskInvisible = isRecentTaskInvisible;

            final WindowContainer container = mTask.getParent();

            container.getRelativePosition(mPosition);

            container.getBounds(mBounds);

            container.getRelativeDisplayedPosition(mPosition);

            mBounds.set(container.getDisplayedBounds());

        }



        RemoteAnimationTarget createRemoteAnimationApp() {