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

Commit 1402c2ef authored by Chong Zhang's avatar Chong Zhang
Browse files

Update divider controller's dim layer when the layer is changed 

The divider's layer assignment could change after the initial adjust
animation has finished.

bug: 28255739
Change-Id: I5899fe22e4fec680c49c881437c7f85d8ee9ca74
parent dc7ce840

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

+4 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ public class DockedStackDividerController implements DimLayerUser { 
            stack.getDimBounds(mTmpRect);

            if (mTmpRect.height() > 0 && mTmpRect.width() > 0) {

                mDimLayer.setBounds(mTmpRect);

                mDimLayer.show(mDisplayContent.mService.mLayersController.getResizeDimLayer(),

                mDimLayer.show(mService.mLayersController.getResizeDimLayer(),

                        alpha, 0 /* duration */);

            } else {

                visibleAndValid = false;
@@ -543,6 +543,9 @@ public class DockedStackDividerController implements DimLayerUser { 
        } else if (mAnimatingForIme) {

            return animateForIme(now);

        } else {

            if (mDimLayer != null) {

                mDimLayer.setLayer(mService.mLayersController.getResizeDimLayer());

            }

            return false;

        }

    }

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

+0 −3
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ public class TaskStack implements DimLayer.DimLayerUser, 
    // Whether the stack and all its tasks is currently being drag-resized

    private boolean mDragResizing;



    private final Rect mLastContentBounds = new Rect();

    private final Rect mTmpAdjustedBounds = new Rect();

    private boolean mAdjustedForIme;

    private boolean mImeGoingAway;
@@ -975,7 +974,6 @@ public class TaskStack implements DimLayer.DimLayerUser, 
            contentBounds.bottom = imeTop;

        }



        mLastContentBounds.set(contentBounds);

        final int yOffset = displayContentRect.bottom - contentBounds.bottom;



        final int dividerWidth =
@@ -1085,7 +1083,6 @@ public class TaskStack implements DimLayer.DimLayerUser, 
        }

        if (!adjust) {

            mTmpAdjustedBounds.setEmpty();

            mLastContentBounds.setEmpty();

        }

        setAdjustedBounds(mTmpAdjustedBounds);