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

Commit 1ae29090 authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by android-build-merger
Browse files

Merge "Fix submenu position when showing with Gravity.END" into oc-dev 

am: 883af076

Change-Id: Ib2799189f34cb8fc2baeb19a6a4a005eb13b64d1
parents 1fe0c5ca 883af076

core/java/com/android/internal/view/menu/MenuPopupHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public class MenuPopupHelper implements MenuHelper { 
            final int hgrav = Gravity.getAbsoluteGravity(mDropDownGravity,

                    mAnchorView.getLayoutDirection()) & Gravity.HORIZONTAL_GRAVITY_MASK;

            if (hgrav == Gravity.RIGHT) {

                xOffset -= mAnchorView.getWidth();

                xOffset += mAnchorView.getWidth();

            }



            popup.setHorizontalOffset(xOffset);

core/java/com/android/internal/view/menu/StandardMenuPopup.java

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ final class StandardMenuPopup extends MenuPopup implements OnDismissListener, On 
                    mShownAnchorView, mOverflowOnly, mPopupStyleAttr, mPopupStyleRes);

            subPopup.setPresenterCallback(mPresenterCallback);

            subPopup.setForceShowIcon(MenuPopup.shouldPreserveIconSpacing(subMenu));

            subPopup.setGravity(mDropDownGravity);



            // Pass responsibility for handling onDismiss to the submenu.

            subPopup.setOnDismissListener(mOnDismissListener);