Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 344d23c0fa

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

Change-Id: I0ef15668c3c0bf4a064871a631b704456d3b6785
This commit is contained in:
Abodunrinwa Toki
2016-05-03 18:22:41 +00:00
committed by android-build-merger
parent b52a4aabde 344d23c0fa
commit d162fa3401
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/widget/FloatingToolbar.java
View File

@@ -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());