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

Commit 78f0b88b authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix wrong inset bounds" into nyc-dev 

am: 18e89da1

* commit '18e89da1':
  Fix wrong inset bounds

Change-Id: I3d7d17ce3a7e958c3109a04eab491a1b62a7b73d
parents 7a83ee9a 18e89da1

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -1984,6 +1984,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        mTmpConfigs.clear();

        mTmpConfigs.clear();

        mTmpInsetBounds.clear();

        mTmpInsetBounds.clear();

        final ArrayList<TaskRecord> tasks = stack.getAllTasks();

        final ArrayList<TaskRecord> tasks = stack.getAllTasks();

        final Rect taskBounds = tempTaskBounds != null ? tempTaskBounds : bounds;

        final Rect insetBounds = tempTaskInsetBounds != null ? tempTaskInsetBounds : taskBounds;

        for (int i = tasks.size() - 1; i >= 0; i--) {

        for (int i = tasks.size() - 1; i >= 0; i--) {

            final TaskRecord task = tasks.get(i);

            final TaskRecord task = tasks.get(i);

            if (task.isResizeable()) {

            if (task.isResizeable()) {
@@ -1995,9 +1997,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                    fitWithinBounds(tempRect2, bounds);

                    fitWithinBounds(tempRect2, bounds);

                    task.updateOverrideConfiguration(tempRect2);

                    task.updateOverrideConfiguration(tempRect2);

                } else {

                } else {

                    task.updateOverrideConfiguration(

                    task.updateOverrideConfiguration(taskBounds, insetBounds);

                            tempTaskBounds != null ? tempTaskBounds : bounds,

                            tempTaskInsetBounds != null ? tempTaskInsetBounds : bounds);

                }

                }

            }

            }