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

Commit e9e82ef6 authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Fixes landscape minimized bounds for launcher hiding widget control"... 

Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev am: 7f481760
am: 4319ddf8

Change-Id: I01035e5b996236ed8a4772fd27c65a7235f59fca
parents d9f25618 4319ddf8

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

+6 −2
Original line number Diff line number Diff line
@@ -191,12 +191,16 @@ public class DockedStackDividerController implements DimLayerUser { 
                mTmpRect);

        int dividerSize = mDividerWindowWidth - 2 * mDividerInsets;

        Configuration configuration = mDisplayContent.getConfiguration();

        // The offset in the left (landscape)/top (portrait) is calculated with the minimized

        // offset value with the divider size and any system insets in that direction.

        if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {

            outBounds.set(0, mTaskHeightInMinimizedMode + dividerSize + mTmpRect.top,

                    di.logicalWidth, di.logicalHeight);

        } else {

            outBounds.set(mTaskHeightInMinimizedMode + dividerSize + mTmpRect.left, 0,

                    di.logicalWidth, di.logicalHeight);

            // In landscape append the left position with the statusbar height to match the

            // minimized size height in portrait mode.

            outBounds.set(mTaskHeightInMinimizedMode + dividerSize + mTmpRect.left + mTmpRect.top,

                    0, di.logicalWidth, di.logicalHeight);

        }

    }