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

Fix FloatingToolbar popup positioning.

Browse Source 
The FloatingToolbar popup wrongly assumes that the main content panel
is wider than the overflow panel. In situations where this assumption
fails, the toolbar popup is positioned wrongly within it's container
window and items appear truncated. This CL fixes this issue.

Bug: 28550367
Change-Id: I41669b1deed7dd34f0b2bd060d14452482d3d36c
This commit is contained in:
Abodunrinwa Toki
2016-05-03 16:25:41 +01:00
parent 629b4cfeee
commit 0780f3a073
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());