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

Commit 59e9628f authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Update dock divider display info. whenever it changes."

parents f350fa8d 58fa9de4

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

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ class DisplayContent { 
    void updateDisplayInfo() {

        mDisplay.getDisplayInfo(mDisplayInfo);

        mDisplay.getMetrics(mDisplayMetrics);

        mDividerControllerLocked.updateDisplayInfo();

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

            mStacks.get(i).updateDisplayInfo(null);

        }

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

+9 −5
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ public class DockedStackDividerController implements View.OnTouchListener, DimLa 
    private final DisplayContent mDisplayContent;

    private final int mSideMargin;

    private final DimLayer mDimLayer;

    private final int mDisplayWidth;

    private final int mDisplayHeight;

    private int mDisplayWidth;

    private int mDisplayHeight;

    private View mView;

    private Rect mTmpRect = new Rect();

    private Rect mLastResizeRect = new Rect();
@@ -72,9 +72,7 @@ public class DockedStackDividerController implements View.OnTouchListener, DimLa 
    DockedStackDividerController(Context context, DisplayContent displayContent) {

        mContext = context;

        mDisplayContent = displayContent;

        final DisplayInfo info = displayContent.getDisplayInfo();

        mDisplayWidth = info.logicalWidth;

        mDisplayHeight = info.logicalHeight;

        updateDisplayInfo();

        mDividerWidth = context.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.docked_stack_divider_thickness);

        mSideMargin = dipToPixel(SIDE_MARGIN_DIP, mDisplayContent.getDisplayMetrics());
@@ -110,6 +108,12 @@ public class DockedStackDividerController implements View.OnTouchListener, DimLa 
        return mView != null;

    }



    void updateDisplayInfo() {

        final DisplayInfo info = mDisplayContent.getDisplayInfo();

        mDisplayWidth = info.logicalWidth;

        mDisplayHeight = info.logicalHeight;

    }



    void update(Configuration configuration, boolean forceUpdate) {

        if (forceUpdate && mView != null) {

            removeDivider();