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

Commit 3b105d92 authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev
Browse files

Revert "Respect PopupWindow.setOverlapAnchor when above anchor" 

This reverts commit 07084924.

Bug: 37951656
Test: android.widget.cts.PopupWindowTest
Change-Id: I6c950d19bbf5c778f799a652595550a2733aae08
parent b1edc48d

core/java/android/widget/PopupWindow.java

+5 −20
Original line number Diff line number Diff line
@@ -1667,32 +1667,17 @@ public class PopupWindow { 
            int anchorHeight, int drawingLocationY, int screenLocationY, int displayFrameTop,

            int displayFrameBottom, boolean allowResize) {

        final int winOffsetY = screenLocationY - drawingLocationY;

        final int popupScreenTop = outParams.y + winOffsetY;

        final int spaceBelow = displayFrameBottom - popupScreenTop;

        if (popupScreenTop >= 0 && height <= spaceBelow) {

        final int anchorTopInScreen = outParams.y + winOffsetY;

        final int spaceBelow = displayFrameBottom - anchorTopInScreen;

        if (anchorTopInScreen >= 0 && height <= spaceBelow) {

            return true;

        }



        final int popupScreenBottom;

        if (mOverlapAnchor) {

            // popupScreenTop equals the anchor's top at this point.

            // When shown above the anchor, an overlapping popup's bottom should be aligned with

            // the anchor's bottom.

            popupScreenBottom = popupScreenTop + anchorHeight;

        } else {

            // popupScreenTop equals the anchor's bottom at this point.

            // When shown above the anchor, a non-overlapping popup's bottom is aligned with

            // the anchor's top.

            popupScreenBottom = popupScreenTop - anchorHeight;

        }

        final int spaceAbove = popupScreenBottom - displayFrameTop;

        final int spaceAbove = anchorTopInScreen - anchorHeight - displayFrameTop;

        if (height <= spaceAbove) {

            // Move everything up.

            if (mOverlapAnchor) {

                // Add one anchorHeight to compensate for the correction made at the start of

                // findDropDownPosition, and another to account for being aligned to the anchor's

                // bottom, not top.

                yOffset += anchorHeight * 2;

                yOffset += anchorHeight;

            }

            outParams.y = drawingLocationY - height + yOffset;