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

Commit d162fa34 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by android-build-merger
Browse files

Merge "Fix FloatingToolbar popup positioning." into nyc-dev 

am: 344d23c0

* commit '344d23c0':
  Fix FloatingToolbar popup positioning.

Change-Id: I0ef15668c3c0bf4a064871a631b704456d3b6785
parents b52a4aab 344d23c0

core/java/com/android/internal/widget/FloatingToolbar.java

+5 −3
Original line number Diff line number Diff line
@@ -909,8 +909,8 @@ public final class FloatingToolbar { 
                    mOverflowPanel.setX(0);  // align left

                } else {

                    mContentContainer.setX(  // align right

                            mMarginHorizontal +

                                    mMainPanelSize.getWidth() - containerSize.getWidth());

                            mPopupWindow.getWidth() -

                                    containerSize.getWidth() - mMarginHorizontal);

                    mMainPanel.setX(-mContentContainer.getX());  // align right

                    mOverflowButton.setX(0);  // align left

                    mOverflowPanel.setX(0);  // align left
@@ -949,7 +949,9 @@ public final class FloatingToolbar { 
                        mOverflowButton.setX(0);  // align left

                        mOverflowPanel.setX(0);  // align left

                    } else {

                        mContentContainer.setX(mMarginHorizontal);  // align left

                        mContentContainer.setX(  // align right

                                mPopupWindow.getWidth() -

                                        containerSize.getWidth() - mMarginHorizontal);

                        mMainPanel.setX(0);  // align left

                        mOverflowButton.setX(  // align right

                                containerSize.getWidth() - mOverflowButtonSize.getWidth());