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

Commit 8d90128b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing app transition due to left-nav bar inset." into nyc-mr1-dev

parents 53185e42 cbb625bc

packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener 
        stackLayout.setSystemInsets(systemInsets);

        if (stack != null) {

            stackLayout.getTaskStackBounds(displayRect, windowRect, systemInsets.top,

                    systemInsets.right, mTaskStackBounds);

                    systemInsets.left, systemInsets.right, mTaskStackBounds);

            stackLayout.reset();

            stackLayout.initialize(displayRect, windowRect, mTaskStackBounds,

                    TaskStackLayoutAlgorithm.StackState.getStackStateForStack(stack));

packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java

+2 −2
Original line number Diff line number Diff line
@@ -511,8 +511,8 @@ public class TaskStack { 
            int top = dockArea.bottom < 1f

                    ? 0

                    : insets.top;

            layoutAlgorithm.getTaskStackBounds(displayRect, windowRectOut, top, insets.right,

                    taskStackBounds);

            layoutAlgorithm.getTaskStackBounds(displayRect, windowRectOut, top, insets.left,

                    insets.right, taskStackBounds);

            return taskStackBounds;

        }

    }

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java

+3 −3
Original line number Diff line number Diff line
@@ -1058,9 +1058,9 @@ public class TaskStackLayoutAlgorithm { 
     * top and right system insets (but not the bottom inset) and left/right paddings, but _not_

     * the top/bottom padding or insets.

     */

    public void getTaskStackBounds(Rect displayRect, Rect windowRect, int topInset, int rightInset,

            Rect taskStackBounds) {

        taskStackBounds.set(windowRect.left, windowRect.top + topInset,

    public void getTaskStackBounds(Rect displayRect, Rect windowRect, int topInset, int leftInset,

            int rightInset, Rect taskStackBounds) {

        taskStackBounds.set(windowRect.left + leftInset, windowRect.top + topInset,

                windowRect.right - rightInset, windowRect.bottom);



        // Ensure that the new width is at most the smaller display edge size

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

+2 −1
Original line number Diff line number Diff line
@@ -1191,7 +1191,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal 
        // bounds have changed.  This is because we may get spurious measures while dragging where

        // our current stack bounds reflect the target drop region.

        mLayoutAlgorithm.getTaskStackBounds(mDisplayRect, new Rect(0, 0, width, height),

                mLayoutAlgorithm.mSystemInsets.top, mLayoutAlgorithm.mSystemInsets.right, mTmpRect);

                mLayoutAlgorithm.mSystemInsets.top, mLayoutAlgorithm.mSystemInsets.left,

                mLayoutAlgorithm.mSystemInsets.right, mTmpRect);

        if (!mTmpRect.equals(mStableStackBounds)) {

            mStableStackBounds.set(mTmpRect);

            mStackBounds.set(mTmpRect);

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

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ public class AppTransition implements Dump { 
        final float thumbWidth = thumbWidthI > 0 ? thumbWidthI : 1;

        final int thumbHeightI = mTmpRect.height();

        final float thumbHeight = thumbHeightI > 0 ? thumbHeightI : 1;

        final int thumbStartX = mTmpRect.left - containingFrame.left;

        final int thumbStartX = mTmpRect.left - containingFrame.left - contentInsets.left;

        final int thumbStartY = mTmpRect.top - containingFrame.top;



        switch (thumbTransitState) {