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

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

Merge "Clear home surface crop size while being organized" into rvc-dev

parents 0c654b66 31de2d67

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+1 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
            t.setPosition(mTiles.mHomeAndRecentsSurfaces.get(i),

                    mTiles.mHomeBounds.left - otherTaskRect.left,

                    mTiles.mHomeBounds.top - otherTaskRect.top);

            t.setWindowCrop(mTiles.mHomeAndRecentsSurfaces.get(i), null);

        }

        final SurfaceControl dividerCtrl = getWindowSurfaceControl();

        if (dividerCtrl != null) {

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

+0 −3
Original line number Diff line number Diff line
@@ -241,9 +241,6 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                                + " multi-window mode... newParent=" + newParent + " task=" + task);

                        return 0;

                    } else {

                        // Clear the window crop on root task since it may not be updated after

                        // reparent (no longer be a root task)

                        task.getSurfaceControl().setWindowCrop(null);

                        task.reparent((ActivityStack) newParent,

                                hop.getToTop() ? POSITION_TOP : POSITION_BOTTOM,

                                false /*moveParents*/, "sanitizeAndApplyHierarchyOp");